From 6b8040dc25fdc5fe614c3796a147517dd50bc7d8 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 11 Dec 2019 09:08:12 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- app/models/application_setting.rb | 3 --- 1 file changed, 3 deletions(-) (limited to 'app/models/application_setting.rb') diff --git a/app/models/application_setting.rb b/app/models/application_setting.rb index 4ba0317b580..e764b6c56b0 100644 --- a/app/models/application_setting.rb +++ b/app/models/application_setting.rb @@ -5,9 +5,6 @@ class ApplicationSetting < ApplicationRecord include CacheMarkdownField include TokenAuthenticatable 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 :health_check_access_token -- cgit v1.2.3