Merge branch...

Merge branch '335812_remove_ignore_rule_for_cloud_license_enabled_in_application_setting' into 'master' Remove ignore rule for cloud_license_enabled in ApplicationSetting See merge request gitlab-org/gitlab!70777

Merge branch...
Merge branch '335812_remove_ignore_rule_for_cloud_license_enabled_in_application_setting' into 'master' Remove ignore rule for cloud_license_enabled in ApplicationSetting See merge request gitlab-org/gitlab!70777
09869aa4 · Luke Duncalfe · 976fe50d · 477bc34d · 09869aa4
Commit 09869aa4 authored Sep 22, 2021 by Luke Duncalfe
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
@@ -10,7 +10,6 @@ class ApplicationSetting < ApplicationRecord

  ignore_columns %i[elasticsearch_shards elasticsearch_replicas], remove_with: '14.4', remove_after: '2021-09-22'
  ignore_column :seat_link_enabled, remove_with: '14.4', remove_after: '2021-09-22'
-  ignore_column :cloud_license_enabled, remove_with: '14.4', remove_after: '2021-09-22'

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