From fa6f19d1f83b68f2bb729be889ab7d66adbbedb8 Mon Sep 17 00:00:00 2001
From: dineshpanda <dineshpanda92@gmail.com>
Date: Fri, 30 Aug 2019 02:09:13 +0530
Subject: Remove dependency on IgnorableColumn concern

---
 app/models/application_setting.rb | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'app/models/application_setting.rb')

diff --git a/app/models/application_setting.rb b/app/models/application_setting.rb
index 2a99c6e5c59..8ff4cba2adb 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 }
@@ -25,12 +24,14 @@ class ApplicationSetting < ApplicationRecord
   serialize :domain_blacklist, Array # rubocop:disable Cop/ActiveRecordSerialize
   serialize :repository_storages # 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
-- 
cgit v1.2.3