Add latest changes from gitlab-org/gitlab@master

2 files changed, 14 insertions, 18 deletions

diff --git a/qa/qa/specs/features/api/1_manage/user_access_termination_spec.rb b/qa/qa/specs/features/api/1_manage/user_access_termination_spec.rb
index d3f80eaf235..8759c36f43f 100644
--- a/qa/qa/specs/features/api/1_manage/user_access_termination_spec.rb
+++ b/qa/qa/specs/features/api/1_manage/user_access_termination_spec.rb
@@ -2,12 +2,8 @@
 
 module QA
   RSpec.describe 'Manage' do
-    # TODO: `:reliable` should be added back once https://gitlab.com/gitlab-org/gitlab/-/issues/403001 is resolved
-    describe 'User', :requires_admin, product_group: :authentication_and_authorization, quarantine: {
-      type: :bug,
-      issue: 'https://gitlab.com/gitlab-org/gitlab/-/issues/403001',
-      except: { subdomain: /(staging.)?/, domain: 'gitlab' }
-    } do
+    # TODO: `:reliable` should be added back once https://gitlab.com/gitlab-org/gitlab/-/issues/359278 is resolved
+    describe 'User', :requires_admin, product_group: :authentication_and_authorization do
       before(:all) do
         admin_api_client = Runtime::API::Client.as_admin
 
@@ -17,14 +13,20 @@ module QA
 
         @user_api_client = Runtime::API::Client.new(:gitlab, user: @user)
 
-        @group = QA::Resource::Group.fabricate_via_api! do |group|
+        @sandbox = Resource::Sandbox.fabricate! do |sandbox_group|
+          sandbox_group.path = "sandbox-for-access-termination-#{SecureRandom.hex(4)}"
+          sandbox_group.api_client = admin_api_client
+        end
+
+        group = QA::Resource::Group.fabricate_via_api! do |group|
           group.path = "group-to-test-access-termination-#{SecureRandom.hex(8)}"
+          group.sandbox = @sandbox
         end
 
-        @group.sandbox.add_member(@user)
+        @sandbox.add_member(@user)
 
         @project = Resource::Project.fabricate_via_api! do |project|
-          project.group = @group
+          project.group = group
           project.name = "project-for-user-group-access-termination"
           project.initialize_with_readme = true
         end
@@ -32,7 +34,7 @@ module QA
 
       context 'after parent group membership termination' do
         before do
-          @group.sandbox.remove_member(@user)
+          @sandbox.remove_member(@user)
         end
 
         it 'is not allowed to push code via the CLI', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347863' do
@@ -82,9 +84,7 @@ module QA
       end
 
       after(:all) do
-        @user.remove_via_api!
-        @project.remove_via_api!
-        @group.remove_via_api!
+        @sandbox.remove_via_api!
       end
     end
   end
diff --git a/qa/qa/specs/features/browser_ui/3_create/merge_request/merge_merge_request_from_fork_spec.rb b/qa/qa/specs/features/browser_ui/3_create/merge_request/merge_merge_request_from_fork_spec.rb
index d27ec32fdda..56e1f3d4a9a 100644
--- a/qa/qa/specs/features/browser_ui/3_create/merge_request/merge_merge_request_from_fork_spec.rb
+++ b/qa/qa/specs/features/browser_ui/3_create/merge_request/merge_merge_request_from_fork_spec.rb
@@ -17,11 +17,7 @@ module QA
         merge_request.fork.remove_via_api!
       end
 
-      it 'can merge feature branch fork to mainline', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347818', quarantine: {
-        only: :production,
-        type: :investigating,
-        issue: 'https://gitlab.com/gitlab-org/gitlab/-/issues/372258'
-      } do
+      it 'can merge source branch from fork into upstream repository', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347818' do
         merge_request.visit!
 
         Page::MergeRequest::Show.perform do |merge_request|