diff --git a/app/models/ci/build_need.rb b/app/models/ci/build_need.rb index 003659570b3019f95ba20be436d90dd4d02a1dd2..bf1470ca20faba99f1d9587b2bcaf4e0629d209a 100644 --- a/app/models/ci/build_need.rb +++ b/app/models/ci/build_need.rb @@ -5,8 +5,6 @@ class BuildNeed < Ci::ApplicationRecord include BulkInsertSafe include IgnorableColumns - ignore_columns :build_id_convert_to_bigint, remove_with: '14.1', remove_after: '2021-07-22' - belongs_to :build, class_name: "Ci::Processable", foreign_key: :build_id, inverse_of: :needs validates :build, presence: true diff --git a/app/models/ci/build_runner_session.rb b/app/models/ci/build_runner_session.rb index 45de47116cd188873d326a85499058891f2e60da..e12c0f82c9934297cae1fcfb694d2869b7c98407 100644 --- a/app/models/ci/build_runner_session.rb +++ b/app/models/ci/build_runner_session.rb @@ -6,8 +6,6 @@ module Ci class BuildRunnerSession < Ci::ApplicationRecord include IgnorableColumns - ignore_columns :build_id_convert_to_bigint, remove_with: '14.1', remove_after: '2021-07-22' - 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 7a15d7ba940020a98e6cdb770ee99ac37a25080a..6edb5ef45798f759d0da9468844e75cb4dfdb743 100644 --- a/app/models/ci/build_trace_chunk.rb +++ b/app/models/ci/build_trace_chunk.rb @@ -9,8 +9,6 @@ class BuildTraceChunk < Ci::ApplicationRecord include ::Gitlab::OptimisticLocking include IgnorableColumns - ignore_columns :build_id_convert_to_bigint, remove_with: '14.1', remove_after: '2021-07-22' - belongs_to :build, class_name: "Ci::Build", foreign_key: :build_id default_value_for :data_store, :redis_trace_chunks diff --git a/app/models/ci/stage.rb b/app/models/ci/stage.rb index 39e26bf2785fa7fb5fe2f151220ca88d610431a8..131e18adf62fd604919cfe65e50774836c367681 100644 --- a/app/models/ci/stage.rb +++ b/app/models/ci/stage.rb @@ -8,8 +8,6 @@ class Stage < Ci::ApplicationRecord include Presentable include IgnorableColumns - ignore_column :id_convert_to_bigint, remove_with: '14.2', remove_after: '2021-08-22' - enum status: Ci::HasStatus::STATUSES_ENUM belongs_to :project diff --git a/app/models/deployment.rb b/app/models/deployment.rb index 4a690ccc67eb49118c56a99a11626fcc794a01fd..7f7da9950ce38543420733914613cf84feadd123 100644 --- a/app/models/deployment.rb +++ b/app/models/deployment.rb @@ -10,8 +10,6 @@ class Deployment < ApplicationRecord include FastDestroyAll include IgnorableColumns - ignore_column :deployable_id_convert_to_bigint, remove_with: '14.2', remove_after: '2021-08-22' - belongs_to :project, required: true belongs_to :environment, required: true belongs_to :cluster, class_name: 'Clusters::Cluster', optional: true diff --git a/ee/app/models/geo/job_artifact_deleted_event.rb b/ee/app/models/geo/job_artifact_deleted_event.rb index 580cdbc752985e9691366cdcc731cf430206f9f5..8e6422fcaa63a1e9edc2c2e8f5d293f0b00e90a0 100644 --- a/ee/app/models/geo/job_artifact_deleted_event.rb +++ b/ee/app/models/geo/job_artifact_deleted_event.rb @@ -7,8 +7,6 @@ class JobArtifactDeletedEvent < ApplicationRecord include BulkInsertSafe include IgnorableColumns - ignore_column :job_artifact_id_convert_to_bigint, remove_with: '14.2', remove_after: '2021-08-22' - belongs_to :job_artifact, class_name: 'Ci::JobArtifact' validates :job_artifact, :file_path, presence: true