From 70723899ceb8a64f41dd145876919e6bbca4bc93 Mon Sep 17 00:00:00 2001 From: "Dmytro Zaporozhets (DZ)" <dmitriy.zaporozhets@gmail.com> Date: Thu, 25 Mar 2021 04:17:53 +0000 Subject: [PATCH] Remove 1 year old ignore column Signed-off-by: Dmytro Zaporozhets <dzaporozhets@gitlab.com> --- app/models/ci/build.rb | 2 -- app/models/ci/runner.rb | 2 -- app/models/deploy_key.rb | 2 -- lib/gitlab/data_builder/build.rb | 1 - lib/gitlab/data_builder/pipeline.rb | 1 - spec/lib/gitlab/data_builder/pipeline_spec.rb | 1 - 6 files changed, 9 deletions(-) diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb index 824e35a6480..76b97041166 100644 --- a/app/models/ci/build.rb +++ b/app/models/ci/build.rb @@ -14,8 +14,6 @@ module Ci BuildArchivedError = Class.new(StandardError) - ignore_columns :artifacts_file, :artifacts_file_store, :artifacts_metadata, :artifacts_metadata_store, :artifacts_size, :commands, remove_after: '2019-12-15', remove_with: '12.7' - belongs_to :project, inverse_of: :builds belongs_to :runner belongs_to :trigger_request diff --git a/app/models/ci/runner.rb b/app/models/ci/runner.rb index d1a20bc93c3..05126853e0f 100644 --- a/app/models/ci/runner.rb +++ b/app/models/ci/runner.rb @@ -45,8 +45,6 @@ module Ci FORM_EDITABLE = %i[description tag_list active run_untagged locked access_level maximum_timeout_human_readable].freeze MINUTES_COST_FACTOR_FIELDS = %i[public_projects_minutes_cost_factor private_projects_minutes_cost_factor].freeze - ignore_column :is_shared, remove_after: '2019-12-15', remove_with: '12.6' - has_many :builds has_many :runner_projects, inverse_of: :runner, dependent: :destroy # rubocop:disable Cop/ActiveRecordDependent has_many :projects, through: :runner_projects diff --git a/app/models/deploy_key.rb b/app/models/deploy_key.rb index db5fd167781..25e3b9fe4f0 100644 --- a/app/models/deploy_key.rb +++ b/app/models/deploy_key.rb @@ -13,8 +13,6 @@ class DeployKey < Key scope :are_public, -> { where(public: true) } scope :with_projects, -> { includes(deploy_keys_projects: { project: [:route, namespace: :route] }) } - ignore_column :can_push, remove_after: '2019-12-15', remove_with: '12.6' - accepts_nested_attributes_for :deploy_keys_projects def private? diff --git a/lib/gitlab/data_builder/build.rb b/lib/gitlab/data_builder/build.rb index 8ce71558ab3..d5f157de372 100644 --- a/lib/gitlab/data_builder/build.rb +++ b/lib/gitlab/data_builder/build.rb @@ -85,7 +85,6 @@ module Gitlab id: runner.id, description: runner.description, active: runner.active?, - is_shared: runner.instance_type?, tags: runner.tags&.map(&:name) } end diff --git a/lib/gitlab/data_builder/pipeline.rb b/lib/gitlab/data_builder/pipeline.rb index 7fd1b9cd228..a56029c0d1d 100644 --- a/lib/gitlab/data_builder/pipeline.rb +++ b/lib/gitlab/data_builder/pipeline.rb @@ -77,7 +77,6 @@ module Gitlab id: runner.id, description: runner.description, active: runner.active?, - is_shared: runner.instance_type?, tags: runner.tags&.map(&:name) } end diff --git a/spec/lib/gitlab/data_builder/pipeline_spec.rb b/spec/lib/gitlab/data_builder/pipeline_spec.rb index cf04f560ceb..bec1e612c02 100644 --- a/spec/lib/gitlab/data_builder/pipeline_spec.rb +++ b/spec/lib/gitlab/data_builder/pipeline_spec.rb @@ -59,7 +59,6 @@ RSpec.describe Gitlab::DataBuilder::Pipeline do expect(runner_data[:id]).to eq(ci_runner.id) expect(runner_data[:description]).to eq(ci_runner.description) expect(runner_data[:active]).to eq(ci_runner.active) - expect(runner_data[:is_shared]).to eq(ci_runner.instance_type?) expect(runner_data[:tags]).to match_array(tag_names) end end -- 2.30.9