diff options
author | Michael Kozono <mkozono@gmail.com> | 2019-08-31 00:59:31 +0300 |
---|---|---|
committer | Michael Kozono <mkozono@gmail.com> | 2019-08-31 00:59:31 +0300 |
commit | 88c6423e4a45103cc480467bc8f412a48e1e0b55 (patch) | |
tree | c16f8134756de3acb3106fd9092ec0f73c8dc3b3 /app/models/application_setting.rb | |
parent | 1495a84cb7620f4d3d92b17146e760a523b1ede1 (diff) | |
parent | d93b985df07ccf07541efef709edb8467e0f2955 (diff) |
Merge branch 'remove-ignorable-column-concern' into 'master'
Remove dependency on IgnorableColumn concern
Closes #66746
See merge request gitlab-org/gitlab-ce!32427
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 d6caf092ed0..e39d655325f 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 } @@ -32,12 +31,14 @@ class ApplicationSetting < ApplicationRecord serialize :repository_storages # rubocop:disable Cop/ActiveRecordSerialize serialize :asset_proxy_whitelist, Array # 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 |