diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb index bceb642bae61e052a3aa246ca314fd23c2736113..19d649451597d52bee8345a4b76d773dd1663cf0 100644 --- a/app/models/ci/build.rb +++ b/app/models/ci/build.rb @@ -1305,8 +1305,6 @@ def prefix_and_partition_for_token override :save_tags def save_tags super do |new_tags, old_tags| - next if ::Feature.disabled?(:write_to_ci_build_tags, project) - if old_tags.present? tag_links .where(tag_id: old_tags) diff --git a/config/feature_flags/gitlab_com_derisk/write_to_ci_build_tags.yml b/config/feature_flags/gitlab_com_derisk/write_to_ci_build_tags.yml deleted file mode 100644 index 8e2f6797cb6ccd00e6f4a665bf60621c90b61831..0000000000000000000000000000000000000000 --- a/config/feature_flags/gitlab_com_derisk/write_to_ci_build_tags.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- -name: write_to_ci_build_tags -feature_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/472973 -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/162276 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/478230 -milestone: '17.4' -group: group::ci platform -type: gitlab_com_derisk -default_enabled: false diff --git a/lib/gitlab/ci/tags/bulk_insert/builds_tags_configuration.rb b/lib/gitlab/ci/tags/bulk_insert/builds_tags_configuration.rb index 6ae7418aa9f944abb06dbb6d66ec7caad21c75f1..139d05051840e495fcfdf7177c014e080599b72d 100644 --- a/lib/gitlab/ci/tags/bulk_insert/builds_tags_configuration.rb +++ b/lib/gitlab/ci/tags/bulk_insert/builds_tags_configuration.rb @@ -5,8 +5,6 @@ module Ci module Tags class BulkInsert class BuildsTagsConfiguration - include Gitlab::Utils::StrongMemoize - def self.applies_to?(record) record.is_a?(::Ci::Build) end @@ -40,9 +38,8 @@ def polymorphic_taggings? end def monomorphic_taggings? - ::Feature.enabled?(:write_to_ci_build_tags, @project) + true end - strong_memoize_attr :monomorphic_taggings? end end end diff --git a/spec/models/ci/build_spec.rb b/spec/models/ci/build_spec.rb index ca3cdf58716a87814e36641f4d1792d8e4725279..8bdcdac8880a1f7decec8e44cfdde838a5d0be88 100644 --- a/spec/models/ci/build_spec.rb +++ b/spec/models/ci/build_spec.rb @@ -1901,20 +1901,6 @@ expect(build.tag_links).to be_empty end end - - context 'with write_to_ci_build_tags disabled' do - before do - stub_feature_flags(write_to_ci_build_tags: false) - end - - it 'does not save tag_links' do - build.save! - - expect(build.tags.count).to eq(1) - expect(build.tags.first.name).to eq('tag') - expect(build.tag_links).to be_empty - end - end end describe '#has_tags?' do