diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-01 06:06:11 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-01 06:06:11 +0000 |
| commit | 864475536355651a9f7caa5b1606aa5640424ec3 (patch) | |
| tree | 1dc80c96ddf3f9049c4a163b4c49f052a9b1a4ad /app/models/application_setting.rb | |
| parent | 7ddd5846999029916b2b6d8560b5b0f02ec0f6ea (diff) | |
| download | gitlab-ce-864475536355651a9f7caa5b1606aa5640424ec3.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/application_setting.rb')
| -rw-r--r-- | app/models/application_setting.rb | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/app/models/application_setting.rb b/app/models/application_setting.rb index 72605af433f..c681d941e35 100644 --- a/app/models/application_setting.rb +++ b/app/models/application_setting.rb @@ -5,12 +5,9 @@ class ApplicationSetting < ApplicationRecord include CacheMarkdownField include TokenAuthenticatable include ChronicDurationAttribute + include IgnorableColumns - # Only remove this >= %12.6 and >= 2019-12-01 - self.ignored_columns += %i[ - pendo_enabled - pendo_url - ] + ignore_columns :pendo_enabled, :pendo_url, remove_after: '2019-12-01', remove_with: '12.6' add_authentication_token_field :runners_registration_token, encrypted: -> { Feature.enabled?(:application_settings_tokens_optional_encryption, default_enabled: true) ? :optional : :required } add_authentication_token_field :health_check_access_token |