diff options
| author | dineshpanda <dineshpanda92@gmail.com> | 2019-08-30 02:09:13 +0530 |
|---|---|---|
| committer | dineshpanda <dineshpanda92@gmail.com> | 2019-08-30 02:09:13 +0530 |
| commit | fa6f19d1f83b68f2bb729be889ab7d66adbbedb8 (patch) | |
| tree | f33896c818180909073c47075798845d6ba335e1 /app/models/application_setting.rb | |
| parent | 921d4f37230c8d6d5c097929520bed51e3679a0c (diff) | |
| download | gitlab-ce-fa6f19d1f83b68f2bb729be889ab7d66adbbedb8.tar.gz | |
Remove dependency on IgnorableColumn concern
Diffstat (limited to 'app/models/application_setting.rb')
| -rw-r--r-- | app/models/application_setting.rb | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/app/models/application_setting.rb b/app/models/application_setting.rb index 2a99c6e5c59..8ff4cba2adb 100644 --- a/app/models/application_setting.rb +++ b/app/models/application_setting.rb @@ -4,7 +4,6 @@ class ApplicationSetting < ApplicationRecord include CacheableAttributes include CacheMarkdownField include TokenAuthenticatable - include IgnorableColumn include ChronicDurationAttribute add_authentication_token_field :runners_registration_token, encrypted: -> { Feature.enabled?(:application_settings_tokens_optional_encryption, default_enabled: true) ? :optional : :required } @@ -25,12 +24,14 @@ class ApplicationSetting < ApplicationRecord serialize :domain_blacklist, Array # rubocop:disable Cop/ActiveRecordSerialize serialize :repository_storages # rubocop:disable Cop/ActiveRecordSerialize - ignore_column :koding_url - ignore_column :koding_enabled - ignore_column :sentry_enabled - ignore_column :sentry_dsn - ignore_column :clientside_sentry_enabled - ignore_column :clientside_sentry_dsn + self.ignored_columns = %i[ + clientside_sentry_dsn + clientside_sentry_enabled + koding_enabled + koding_url + sentry_dsn + sentry_enabled + ] cache_markdown_field :sign_in_text cache_markdown_field :help_page_text |