Skip to content

G
gitlab-ce
Commit c4a84ee5 authored by Doug Stull's avatar Doug Stull Committed by Grzegorz Bizon
Browse files
Options

Remove follow up ignored application settings 

- should be removed with 12.6 and after 12/1/2019 as part
  of cleanup
parent c3ca883e
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 3 deletions
app/models/application_setting.rb
View file @ c4a84ee5
...@@ -5,9 +5,6 @@ class ApplicationSetting < ApplicationRecord ...@@ -5,9 +5,6 @@ class ApplicationSetting < ApplicationRecord
include CacheMarkdownField include CacheMarkdownField
include TokenAuthenticatable include TokenAuthenticatable
include ChronicDurationAttribute include ChronicDurationAttribute
include IgnorableColumns
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 :runners_registration_token, encrypted: -> { Feature.enabled?(:application_settings_tokens_optional_encryption, default_enabled: true) ? :optional : :required }
add_authentication_token_field :health_check_access_token add_authentication_token_field :health_check_access_token
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7