More column ignores

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

ee/app/models/plan.rb

 # frozen_string_literal: true
 
 class Plan < ApplicationRecord
-  # Remove these in version >= 12.6
-  self.ignored_columns += %i[active_pipelines_limit pipeline_size_limit active_jobs_limit]
+  include IgnorableColumns
+
+  ignore_columns %i[active_pipelines_limit pipeline_size_limit active_jobs_limit], remove_after: '2019-12-01', remove_with: '12.6'
 
   DEFAULT = 'default'.freeze
   FREE = 'free'.freeze