Merge branch 'remove-old-ignore-column-ee' into 'master'

Remove some old `ignore_column` in AR models

See merge request gitlab-org/gitlab-ee!14764

app/models/application_setting.rb

@@ -31,15 +31,6 @@ class ApplicationSetting < ApplicationRecord
   serialize :repository_storages # rubocop:disable Cop/ActiveRecordSerialize
   serialize :asset_proxy_whitelist, Array # rubocop:disable Cop/ActiveRecordSerialize
 
-  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
   cache_markdown_field :shared_runners_text, pipeline: :plain_markdown

app/models/note.rb

@@ -33,8 +33,6 @@ class Note < ApplicationRecord
     end
   end
 
-  self.ignored_columns += %i[original_discussion_id]
-
   cache_markdown_field :note, pipeline: :note, issuable_state_filter_enabled: true
 
   redact_field :note

app/models/notification_setting.rb

 # frozen_string_literal: true
 
 class NotificationSetting < ApplicationRecord
-  self.ignored_columns += %i[events]
-
   enum level: { global: 3, watch: 2, participating: 1, mention: 4, disabled: 0, custom: 5 }
 
   default_value_for :level, NotificationSetting.levels[:global]

app/models/user.rb

@@ -23,12 +23,6 @@ class User < ApplicationRecord
 
   DEFAULT_NOTIFICATION_LEVEL = :participating
 
-  self.ignored_columns += %i[
-    authentication_token
-    email_provider
-    external_email
-  ]
-
   add_authentication_token_field :incoming_email_token, token_generator: -> { SecureRandom.hex.to_i(16).to_s(36) }
   add_authentication_token_field :feed_token
 

ee/app/models/ee/application_setting.rb

@@ -14,8 +14,6 @@ module EE
 
       belongs_to :file_template_project, class_name: "Project"
 
-      self.ignored_columns += %i[minimum_mirror_sync_time]
-
       validates :shared_runners_minutes,
                 numericality: { greater_than_or_equal_to: 0 }
 

ee/app/models/ee/project.rb

@@ -24,7 +24,6 @@ module EE
       self.ignored_columns += %i[
         mirror_last_update_at
         mirror_last_successful_update_at
-        next_execution_timestamp
       ]
 
       before_save :set_override_pull_mirror_available, unless: -> { ::Gitlab::CurrentSettings.mirror_available }

ee/app/models/ee/project_import_state.rb

@@ -6,8 +6,6 @@ module EE
     extend ::Gitlab::Utils::Override
 
     prepended do
-      self.ignored_columns += %i[created_at updated_at]
-
       BACKOFF_PERIOD = 24.seconds
       JITTER = 6.seconds
 

ee/app/models/ee/user.rb

@@ -18,8 +18,6 @@ module EE
     prepended do
       EMAIL_OPT_IN_SOURCE_ID_GITLAB_COM = 1
 
-      self.ignored_columns += %i[support_bot]
-
       # We aren't using the `auditor?` method for the `if` condition here
       # because `auditor?` returns `false` when the `auditor` column is `true`
       # and the auditor add-on absent. We want to run this validation

ee/app/models/project_repository_state.rb

@@ -3,8 +3,6 @@
 class ProjectRepositoryState < ApplicationRecord
   include ShaAttribute
 
-  self.ignored_columns += %i[last_repository_verification_failed last_wiki_verification_failed]
-
   sha_attribute :repository_verification_checksum
   sha_attribute :wiki_verification_checksum
 

spec/services/ci/retry_build_service_spec.rb

@@ -40,7 +40,7 @@ describe Ci::RetryBuildService do
        user_id auto_canceled_by_id retried failure_reason
        sourced_pipelines artifacts_file_store artifacts_metadata_store
        metadata runner_session trace_chunks upstream_pipeline_id
-       artifacts_file artifacts_metadata artifacts_size].freeze
+       artifacts_file artifacts_metadata artifacts_size commands].freeze
 
   shared_examples 'build duplication' do
     let(:another_pipeline) { create(:ci_empty_pipeline, project: project) }