Commit eda4abcd authored by Grzegorz Bizon's avatar Grzegorz Bizon

Merge branch '35295-follow-up-from-remove-pendo-from-ee' into 'master'

Resolve "Follow-up from "Remove Pendo from EE""

Closes #35295

See merge request gitlab-org/gitlab!21324
parents c3ca883e 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