Add latest changes from gitlab-org/gitlab@14-5-stable-eev14.5.0-rc42

1 files changed, 0 insertions, 24 deletions

diff --git a/spec/migrations/complete_namespace_settings_migration_spec.rb b/spec/migrations/complete_namespace_settings_migration_spec.rb
deleted file mode 100644
index 46c455d8b19..00000000000
--- a/spec/migrations/complete_namespace_settings_migration_spec.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-require_migration!
-
-RSpec.describe CompleteNamespaceSettingsMigration, :redis do
-  let(:migration) { spy('migration') }
-
-  context 'when still legacy artifacts exist' do
-    let(:namespaces) { table(:namespaces) }
-    let(:namespace_settings) { table(:namespace_settings) }
-    let!(:namespace) { namespaces.create!(name: 'gitlab', path: 'gitlab-org') }
-
-    it 'steals sidekiq jobs from BackfillNamespaceSettings background migration' do
-      expect(Gitlab::BackgroundMigration).to receive(:steal).with('BackfillNamespaceSettings')
-
-      migrate!
-    end
-
-    it 'migrates namespaces without namespace_settings' do
-      expect { migrate! }.to change { namespace_settings.count }.from(0).to(1)
-    end
-  end
-end