Add latest changes from gitlab-org/gitlab@master

8 files changed, 0 insertions, 24 deletions

diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb
index f663a6276cb..273fdf5df85 100644
--- a/app/models/ci/build.rb
+++ b/app/models/ci/build.rb
@@ -10,7 +10,6 @@ module Ci
     include Presentable
     include Importable
     include Ci::HasRef
-    include IgnorableColumns
 
     BuildArchivedError = Class.new(StandardError)
 
@@ -70,9 +69,6 @@ module Ci
     delegate :gitlab_deploy_token, to: :project
     delegate :trigger_short_token, to: :trigger_request, allow_nil: true
 
-    ignore_columns :id_convert_to_bigint, remove_with: '14.5', remove_after: '2021-10-22'
-    ignore_columns :stage_id_convert_to_bigint, remove_with: '14.5', remove_after: '2021-10-22'
-
     ##
     # Since Gitlab 11.5, deployments records started being created right after
     # `ci_builds` creation. We can look up a relevant `environment` through
diff --git a/app/models/ci/build_metadata.rb b/app/models/ci/build_metadata.rb
index 54c0d474990..56568c02d65 100644
--- a/app/models/ci/build_metadata.rb
+++ b/app/models/ci/build_metadata.rb
@@ -37,8 +37,6 @@ module Ci
         job_timeout_source: 4
     }
 
-    ignore_column :build_id_convert_to_bigint, remove_with: '14.5', remove_after: '2021-10-22'
-    ignore_columns :id_convert_to_bigint, remove_with: '14.5', remove_after: '2021-10-22'
     ignore_columns :runner_features, remove_with: '14.7', remove_after: '2021-11-22'
 
     def update_timeout_state
diff --git a/app/models/ci/build_need.rb b/app/models/ci/build_need.rb
index bf1470ca20f..d4cbbfac4ab 100644
--- a/app/models/ci/build_need.rb
+++ b/app/models/ci/build_need.rb
@@ -3,7 +3,6 @@
 module Ci
   class BuildNeed < Ci::ApplicationRecord
     include BulkInsertSafe
-    include IgnorableColumns
 
     belongs_to :build, class_name: "Ci::Processable", foreign_key: :build_id, inverse_of: :needs
 
@@ -13,12 +12,5 @@ module Ci
 
     scope :scoped_build, -> { where('ci_builds.id=ci_build_needs.build_id') }
     scope :artifacts, -> { where(artifacts: true) }
-
-    # TODO: Remove once build_id_convert_to_bigint is not an "ignored" column anymore (see .ignore_columns above)
-    # There is a database-side trigger to populate this column. This is unexpected in the context
-    # of cloning an instance, e.g. when retrying the job. Hence we exclude the ignored column explicitly here.
-    def attributes
-      super.except('build_id_convert_to_bigint')
-    end
   end
 end
diff --git a/app/models/ci/build_runner_session.rb b/app/models/ci/build_runner_session.rb
index e12c0f82c99..c6dbb5d0a43 100644
--- a/app/models/ci/build_runner_session.rb
+++ b/app/models/ci/build_runner_session.rb
@@ -4,8 +4,6 @@ module Ci
   # The purpose of this class is to store Build related runner session.
   # Data will be removed after transitioning from running to any state.
   class BuildRunnerSession < Ci::ApplicationRecord
-    include IgnorableColumns
-
     TERMINAL_SUBPROTOCOL = 'terminal.gitlab.com'
     DEFAULT_SERVICE_NAME = 'build'
     DEFAULT_PORT_NAME = 'default_port'
diff --git a/app/models/ci/build_trace_chunk.rb b/app/models/ci/build_trace_chunk.rb
index 6edb5ef4579..221a2284106 100644
--- a/app/models/ci/build_trace_chunk.rb
+++ b/app/models/ci/build_trace_chunk.rb
@@ -7,7 +7,6 @@ module Ci
     include ::Checksummable
     include ::Gitlab::ExclusiveLeaseHelpers
     include ::Gitlab::OptimisticLocking
-    include IgnorableColumns
 
     belongs_to :build, class_name: "Ci::Build", foreign_key: :build_id
 
diff --git a/app/models/ci/job_artifact.rb b/app/models/ci/job_artifact.rb
index ad3e867f9d5..c2a800c7e19 100644
--- a/app/models/ci/job_artifact.rb
+++ b/app/models/ci/job_artifact.rb
@@ -10,9 +10,6 @@ module Ci
     include Artifactable
     include FileStoreMounter
     include EachBatch
-    include IgnorableColumns
-
-    ignore_columns %i[id_convert_to_bigint job_id_convert_to_bigint], remove_with: '14.5', remove_after: '2021-11-22'
 
     TEST_REPORT_FILE_TYPES = %w[junit].freeze
     COVERAGE_REPORT_FILE_TYPES = %w[cobertura].freeze
diff --git a/app/models/ci/sources/pipeline.rb b/app/models/ci/sources/pipeline.rb
index 95842d944f9..f78caf710a6 100644
--- a/app/models/ci/sources/pipeline.rb
+++ b/app/models/ci/sources/pipeline.rb
@@ -4,9 +4,6 @@ module Ci
   module Sources
     class Pipeline < Ci::ApplicationRecord
       include Ci::NamespacedModelName
-      include IgnorableColumns
-
-      ignore_columns 'source_job_id_convert_to_bigint', remove_with: '14.5', remove_after: '2021-11-22'
 
       self.table_name = "ci_sources_pipelines"
 
diff --git a/app/models/ci/stage.rb b/app/models/ci/stage.rb
index 131e18adf62..e2b15497638 100644
--- a/app/models/ci/stage.rb
+++ b/app/models/ci/stage.rb
@@ -6,7 +6,6 @@ module Ci
     include Ci::HasStatus
     include Gitlab::OptimisticLocking
     include Presentable
-    include IgnorableColumns
 
     enum status: Ci::HasStatus::STATUSES_ENUM