Add latest changes from gitlab-org/gitlab@master

2 files changed, 7 insertions, 10 deletions

diff --git a/qa/qa/specs/features/api/1_manage/migration/gitlab_migration_project_spec.rb b/qa/qa/specs/features/api/1_manage/migration/gitlab_migration_project_spec.rb
index 9f452103fd5..040c92f296f 100644
--- a/qa/qa/specs/features/api/1_manage/migration/gitlab_migration_project_spec.rb
+++ b/qa/qa/specs/features/api/1_manage/migration/gitlab_migration_project_spec.rb
@@ -6,24 +6,19 @@ module QA
       include_context 'with gitlab project migration'
 
       # this spec is used as a sanity test for gitlab migration because it can run outside of orchestrated setup
-      # TODO: `:reliable` should be added back once https://gitlab.com/gitlab-org/gitlab/-/issues/403001 is resolved
-      context 'with import within same instance', orchestrated: false, import: false, quarantine: {
-        type: :bug,
-        issue: 'https://gitlab.com/gitlab-org/gitlab/-/issues/403001',
-        except: { subdomain: /(staging.)?/, domain: 'gitlab' }
-      } do
+      context 'with import within same instance', orchestrated: false, import: false do
         let!(:source_project_with_readme) { true }
         let!(:source_gitlab_address) { Runtime::Scenario.gitlab_address }
         let!(:source_admin_api_client) { admin_api_client }
 
+        # do not use top level group (sandbox) to avoid issues when applying permissions etc. because it will contain
+        # a lot subgroups and projects on live envs
         let!(:source_sandbox) do
-          Resource::Sandbox.fabricate_via_api! do |group|
+          Resource::Group.fabricate_via_api! do |group|
             group.api_client = admin_api_client
           end
         end
 
-        let!(:target_sandbox) { source_sandbox }
-
         let!(:source_group) do
           Resource::Group.fabricate_via_api! do |group|
             group.api_client = admin_api_client
@@ -33,6 +28,8 @@ module QA
           end
         end
 
+        let!(:target_sandbox) { source_sandbox }
+
         let(:destination_group_path) { "target-group-for-import-#{SecureRandom.hex(4)}" }
         let(:cleanup!) { user.remove_via_api! }
 
diff --git a/qa/qa/specs/features/shared_contexts/import/gitlab_group_migration_common.rb b/qa/qa/specs/features/shared_contexts/import/gitlab_group_migration_common.rb
index 4bd81ccdf36..bfd0825cf91 100644
--- a/qa/qa/specs/features/shared_contexts/import/gitlab_group_migration_common.rb
+++ b/qa/qa/specs/features/shared_contexts/import/gitlab_group_migration_common.rb
@@ -77,7 +77,7 @@ module QA
       imported_group.import_details.sum([]) { |details| details[:failures] }
     end
 
-    let(:cleanup!) {}
+    let(:cleanup!) {} # rubocop:disable Lint/EmptyBlock
 
     def expect_group_import_finished_successfully
       imported_group # trigger import