Add latest changes from gitlab-org/gitlab@master

5 files changed, 8 insertions, 7 deletions

diff --git a/qa/qa/specs/features/api/9_data_stores/user_inherited_access_spec.rb b/qa/qa/specs/features/api/9_data_stores/user_inherited_access_spec.rb
index 03a1d4f0c88..5f521037bfa 100644
--- a/qa/qa/specs/features/api/9_data_stores/user_inherited_access_spec.rb
+++ b/qa/qa/specs/features/api/9_data_stores/user_inherited_access_spec.rb
@@ -132,6 +132,7 @@ module QA
 
         it(
           'is not allowed to create a file in parent group project via the API',
+          :reliable,
           testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/363343'
         ) do
           expect do
diff --git a/qa/qa/specs/features/browser_ui/9_data_stores/group/group_member_access_request_spec.rb b/qa/qa/specs/features/browser_ui/9_data_stores/group/group_member_access_request_spec.rb
index 8d29681f262..4786e2cc853 100644
--- a/qa/qa/specs/features/browser_ui/9_data_stores/group/group_member_access_request_spec.rb
+++ b/qa/qa/specs/features/browser_ui/9_data_stores/group/group_member_access_request_spec.rb
@@ -29,7 +29,7 @@ module QA
         user&.remove_via_api!
       end
 
-      it 'generates a todo item for the group owner',
+      it 'generates a todo item for the group owner', :reliable,
         testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/370132' do
         Page::Dashboard::Todos.perform do |todos|
           expect(todos).to have_latest_todo_with_author(
@@ -53,7 +53,7 @@ module QA
             end
           end
 
-          it 'adds user to the group',
+          it 'adds user to the group', :reliable,
             testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/386792' do
             found_member = group.reload!.find_member(user.username)
 
@@ -70,7 +70,7 @@ module QA
             end
           end
 
-          it 'does not add user to the group',
+          it 'does not add user to the group', :reliable,
             testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/386793' do
             found_member = group.reload!.find_member(user.username)
 
diff --git a/qa/qa/specs/features/browser_ui/9_data_stores/group/transfer_group_spec.rb b/qa/qa/specs/features/browser_ui/9_data_stores/group/transfer_group_spec.rb
index 41e6723d300..116fddac231 100644
--- a/qa/qa/specs/features/browser_ui/9_data_stores/group/transfer_group_spec.rb
+++ b/qa/qa/specs/features/browser_ui/9_data_stores/group/transfer_group_spec.rb
@@ -16,7 +16,7 @@ module QA
         sub_group_for_transfer.visit!
       end
 
-      it 'transfers a subgroup to another group',
+      it 'transfers a subgroup to another group', :reliable,
         testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347692' do
         Page::Group::Menu.perform(&:go_to_general_settings)
         Page::Group::Settings::General.perform do |general|
diff --git a/qa/qa/specs/features/browser_ui/9_data_stores/user/follow_user_activity_spec.rb b/qa/qa/specs/features/browser_ui/9_data_stores/user/follow_user_activity_spec.rb
index d7530961253..ff41ba4f8f3 100644
--- a/qa/qa/specs/features/browser_ui/9_data_stores/user/follow_user_activity_spec.rb
+++ b/qa/qa/specs/features/browser_ui/9_data_stores/user/follow_user_activity_spec.rb
@@ -51,7 +51,7 @@ module QA
         following_user&.remove_via_api!
       end
 
-      it 'can be followed and their activity seen',
+      it 'can be followed and their activity seen', :reliable,
         testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347678' do
         Flow::Login.sign_in(as: following_user)
         page.visit Runtime::Scenario.gitlab_address + "/#{followed_user.username}"
diff --git a/qa/qa/specs/features/browser_ui/9_data_stores/user/user_inherited_access_spec.rb b/qa/qa/specs/features/browser_ui/9_data_stores/user/user_inherited_access_spec.rb
index 11ad1bb19b8..67c9f1240a8 100644
--- a/qa/qa/specs/features/browser_ui/9_data_stores/user/user_inherited_access_spec.rb
+++ b/qa/qa/specs/features/browser_ui/9_data_stores/user/user_inherited_access_spec.rb
@@ -33,7 +33,7 @@ module QA
         end
 
         it(
-          'is allowed to edit the sub-group project files',
+          'is allowed to edit the sub-group project files', :reliable,
           testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/363467'
         ) do
           Flow::Login.sign_in(as: parent_group_user)
@@ -71,7 +71,7 @@ module QA
         end
 
         it(
-          'is not allowed to edit the parent group project files',
+          'is not allowed to edit the parent group project files', :reliable,
           testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/363466'
         ) do
           Flow::Login.sign_in(as: sub_group_user)