Add latest changes from gitlab-org/gitlab@master

2 files changed, 12 insertions, 4 deletions

diff --git a/qa/qa/specs/features/api/1_manage/project_access_token_spec.rb b/qa/qa/specs/features/api/1_manage/project_access_token_spec.rb
index 34f0c381be1..d693bbd43ff 100644
--- a/qa/qa/specs/features/api/1_manage/project_access_token_spec.rb
+++ b/qa/qa/specs/features/api/1_manage/project_access_token_spec.rb
@@ -14,7 +14,7 @@ module QA
       end
 
       context 'for the same project' do
-        it 'can be used to create a file via the project API', :reliable, testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347858' do
+        it 'can be used to create a file via the project API', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347858' do
           expect do
             Resource::File.fabricate_via_api! do |file|
               file.api_client = @user_api_client
@@ -46,7 +46,7 @@ module QA
           @different_project = Resource::Project.fabricate!
         end
 
-        it 'cannot be used to create a file via the project API', :reliable, testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347860' do
+        it 'cannot be used to create a file via the project API', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347860' do
           expect do
             Resource::File.fabricate_via_api! do |file|
               file.api_client = @user_api_client
@@ -59,7 +59,7 @@ module QA
           end.to raise_error(Resource::ApiFabricator::ResourceFabricationFailedError, /403 Forbidden/)
         end
 
-        it 'cannot be used to commit via the API', :reliable, testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347861' do
+        it 'cannot be used to commit via the API', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347861' do
           expect do
             Resource::Repository::Commit.fabricate_via_api! do |commit|
               commit.api_client = @user_api_client
diff --git a/qa/qa/specs/features/browser_ui/3_create/pages/new_static_page_spec.rb b/qa/qa/specs/features/browser_ui/3_create/pages/new_static_page_spec.rb
index 449bffe61e0..4dc93bdf112 100644
--- a/qa/qa/specs/features/browser_ui/3_create/pages/new_static_page_spec.rb
+++ b/qa/qa/specs/features/browser_ui/3_create/pages/new_static_page_spec.rb
@@ -9,7 +9,8 @@ module QA
                    issue: 'https://gitlab.com/gitlab-org/gitlab/-/issues/383215',
                    type: :test_environment,
                    only: { subdomain: 'staging-ref' }
-                 } do
+                 },
+                 feature_flag: { name: 'show_pages_in_deployments_menu' } do
     # TODO: Convert back to :smoke once proved to be stable. Related issue: https://gitlab.com/gitlab-org/gitlab/-/issues/300906
     describe 'Pages', product_group: :editor do
       let!(:project) do
@@ -29,6 +30,9 @@ module QA
       end
 
       before do
+        # Pages Menu Experiment currently progress https://gitlab.com/gitlab-org/gitlab/-/merge_requests/98044
+        # Update spec along with Feature Flag Removal.
+        Runtime::Feature.disable(:show_pages_in_deployments_menu)
         Flow::Login.sign_in
         Resource::Runner.fabricate_via_api! do |runner|
           runner.project = project
@@ -37,6 +41,10 @@ module QA
         pipeline.visit!
       end
 
+      after do
+        Runtime::Feature.enable(:show_pages_in_deployments_menu)
+      end
+
       it 'creates a Pages website',
       testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347669' do
         Page::Project::Pipeline::Show.perform do |show|