Automatic merge of gitlab-org/gitlab master

7c8a2497 · GitLab Bot · 691f9b4a · 083d53ca · 7c8a2497
Commit 7c8a2497 authored Nov 02, 2020 by GitLab Bot
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletion

app/models/application_setting.rb app/models/application_setting.rb +0 -1

No files found.
--- a/app/models/application_setting.rb
+++ b/app/models/application_setting.rb
@@ -8,7 +8,6 @@ class ApplicationSetting < ApplicationRecord
  include IgnorableColumns

  ignore_column :namespace_storage_size_limit, remove_with: '13.5', remove_after: '2020-09-22'
-  ignore_column :instance_statistics_visibility_private, remove_with: '13.6', remove_after: '2020-10-22'

  INSTANCE_REVIEW_MIN_USERS = 50
  GRAFANA_URL_ERROR_MESSAGE = 'Please check your Grafana URL setting in ' \