Add latest changes from gitlab-org/gitlab@master

2 files changed, 3 insertions, 13 deletions

diff --git a/qa/qa/page/project/sub_menus/repository.rb b/qa/qa/page/project/sub_menus/repository.rb
index f9d55c0009c..b8ebaa10a49 100644
--- a/qa/qa/page/project/sub_menus/repository.rb
+++ b/qa/qa/page/project/sub_menus/repository.rb
@@ -40,7 +40,7 @@ module QA
           def go_to_repository_contributors
             hover_repository do
               within_submenu do
-                click_element(:sidebar_menu_item_link, menu_item: 'Contributors')
+                click_element(:sidebar_menu_item_link, menu_item: 'Contributor statistics')
               end
             end
           end
diff --git a/qa/qa/specs/features/browser_ui/3_create/web_ide/server_hooks_custom_error_message_spec.rb b/qa/qa/specs/features/browser_ui/3_create/web_ide/server_hooks_custom_error_message_spec.rb
index 080832990c9..8082c54a6ee 100644
--- a/qa/qa/specs/features/browser_ui/3_create/web_ide/server_hooks_custom_error_message_spec.rb
+++ b/qa/qa/specs/features/browser_ui/3_create/web_ide/server_hooks_custom_error_message_spec.rb
@@ -1,13 +1,8 @@
 # frozen_string_literal: true
 
+# TODO: remove this test when 'vscode_web_ide' feature flag is default enabled
 module QA
-  RSpec.describe 'Create', :skip_live_env, except: { job: 'review-qa-*' },
-    feature_flag: { name: 'vscode_web_ide', scope: :global },
-    product_group: :editor,
-    quarantine: {
-      issue: 'https://gitlab.com/gitlab-org/gitlab/-/issues/387928',
-      type: :stale
-    } do
+  RSpec.describe 'Create', :skip_live_env, except: { job: 'review-qa-*' }, product_group: :editor do
     describe 'Git Server Hooks' do
       let(:file_path) { File.join(Runtime::Path.fixtures_path, 'web_ide', 'README.md') }
 
@@ -20,15 +15,10 @@ module QA
       end
 
       before do
-        Runtime::Feature.disable(:vscode_web_ide)
         Flow::Login.sign_in
         project.visit!
       end
 
-      after do
-        Runtime::Feature.enable(:vscode_web_ide)
-      end
-
       context 'with custom error messages' do
         it 'renders preconfigured error message when user hook failed on commit in WebIDE',
           testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/364751' do