diff --git a/config/feature_flags/gitlab_com_derisk/github_importer_attachments.yml b/config/feature_flags/gitlab_com_derisk/github_importer_attachments.yml deleted file mode 100644 index ab068225d2cf13ddaac447bf27af49d4cf6ac4dd..0000000000000000000000000000000000000000 --- a/config/feature_flags/gitlab_com_derisk/github_importer_attachments.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- -name: github_importer_attachments -feature_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/436400 -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/140524 -rollout_issue_url: https://gitlab.com/gitlab-com/gl-infra/production/-/issues/17318 -milestone: '16.8' -group: group::import and integrate -type: gitlab_com_derisk -default_enabled: false diff --git a/lib/gitlab/github_import/importer/attachments/base_importer.rb b/lib/gitlab/github_import/importer/attachments/base_importer.rb index 844008f80874b8cbd546bc9e22dcc337e6082492..9dfa6bb2ff6fa58276bbd4d75d29b8e781a9719d 100644 --- a/lib/gitlab/github_import/importer/attachments/base_importer.rb +++ b/lib/gitlab/github_import/importer/attachments/base_importer.rb @@ -52,8 +52,6 @@ def object_representation(object) end def has_attachments?(object) - return true if Feature.disabled?(:github_importer_attachments, project, type: :gitlab_com_derisk) - object_representation(object).has_attachments? end end diff --git a/spec/lib/gitlab/github_import/importer/attachments/issues_importer_spec.rb b/spec/lib/gitlab/github_import/importer/attachments/issues_importer_spec.rb index 20152020897a0c142f23e4f1096bba313c0befc8..223b7318d690bf9e51463116a859d8af1ef7d932 100644 --- a/spec/lib/gitlab/github_import/importer/attachments/issues_importer_spec.rb +++ b/spec/lib/gitlab/github_import/importer/attachments/issues_importer_spec.rb @@ -41,20 +41,6 @@ importer.sequential_import end - context 'when flag is disabled' do - before do - stub_feature_flags(github_importer_attachments: false) - end - - it 'executes importer for both issues' do - expect_next_instances_of(Gitlab::GithubImport::Importer::NoteAttachmentsImporter, 2) do |importer| - expect(importer).to receive(:execute) - end - - importer.sequential_import - end - end - context 'when issue has already been processed' do before do importer.mark_as_imported(issue_with_attachment) diff --git a/spec/lib/gitlab/github_import/importer/attachments/merge_requests_importer_spec.rb b/spec/lib/gitlab/github_import/importer/attachments/merge_requests_importer_spec.rb index 5ed6dce85073d3829778f4584c1537efb52e033f..5449d4def1f4b4d9e598798ca0794b5c06f928af 100644 --- a/spec/lib/gitlab/github_import/importer/attachments/merge_requests_importer_spec.rb +++ b/spec/lib/gitlab/github_import/importer/attachments/merge_requests_importer_spec.rb @@ -42,20 +42,6 @@ importer.sequential_import end - context 'when flag is disabled' do - before do - stub_feature_flags(github_importer_attachments: false) - end - - it 'executes importer for both merge requests' do - expect_next_instances_of(Gitlab::GithubImport::Importer::NoteAttachmentsImporter, 2) do |importer| - expect(importer).to receive(:execute) - end - - importer.sequential_import - end - end - context 'when merge request has already been processed' do before do importer.mark_as_imported(mr_with_attachment) diff --git a/spec/lib/gitlab/github_import/importer/attachments/notes_importer_spec.rb b/spec/lib/gitlab/github_import/importer/attachments/notes_importer_spec.rb index da0ee1ed0ddeddb3c6881955858037a8155322f2..1dfe69ec12db6e56778da0374d5b0813d9b31a59 100644 --- a/spec/lib/gitlab/github_import/importer/attachments/notes_importer_spec.rb +++ b/spec/lib/gitlab/github_import/importer/attachments/notes_importer_spec.rb @@ -52,20 +52,6 @@ importer.sequential_import end - context 'when flag is disabled' do - before do - stub_feature_flags(github_importer_attachments: false) - end - - it 'executes importer for both user notes' do - expect_next_instances_of(Gitlab::GithubImport::Importer::NoteAttachmentsImporter, 2) do |importer| - expect(importer).to receive(:execute) - end - - importer.sequential_import - end - end - context 'when note has already been processed' do before do importer.mark_as_imported(note_with_attachment) diff --git a/spec/lib/gitlab/github_import/importer/attachments/releases_importer_spec.rb b/spec/lib/gitlab/github_import/importer/attachments/releases_importer_spec.rb index cf51760d966a11e870aaf883039d87217408db14..4886cb923dcc6426e125ab95098c4f5c82d85f3f 100644 --- a/spec/lib/gitlab/github_import/importer/attachments/releases_importer_spec.rb +++ b/spec/lib/gitlab/github_import/importer/attachments/releases_importer_spec.rb @@ -41,20 +41,6 @@ importer.sequential_import end - context 'when flag is disabled' do - before do - stub_feature_flags(github_importer_attachments: false) - end - - it 'executes importer for both releases' do - expect_next_instances_of(Gitlab::GithubImport::Importer::NoteAttachmentsImporter, 2) do |importer| - expect(importer).to receive(:execute) - end - - importer.sequential_import - end - end - context 'when release has already been processed' do before do importer.mark_as_imported(release_with_attachment)