Add latest changes from gitlab-org/gitlab@master

lib/api/commit_statuses.rb

@@ -52,8 +52,8 @@ module API
         optional :ref,         type: String,  desc: 'The ref'
         optional :target_url,  type: String,  desc: 'The target URL to associate with this status'
         optional :description, type: String,  desc: 'A short description of the status'
-        optional :name,        type: String,  desc: 'A string label to differentiate this status from the status of other systems. Default: "default"'
-        optional :context,     type: String,  desc: 'A string label to differentiate this status from the status of other systems. Default: "default"'
+        optional :name,        type: String,  desc: 'A string label to differentiate this status from the status of other systems. Default: "default"', documentation: { default: 'default' }
+        optional :context,     type: String,  desc: 'A string label to differentiate this status from the status of other systems. Default: "default"', documentation: { default: 'default' }
         optional :coverage,    type: Float,   desc: 'The total code coverage'
         optional :pipeline_id, type: Integer, desc: 'An existing pipeline ID, when multiple pipelines on the same commit SHA have been triggered'
       end

qa/qa/specs/features/api/1_manage/import/import_github_repo_spec.rb

@@ -3,7 +3,7 @@
 module QA
   # Spec uses real github.com, which means outage of github.com can actually block deployment
   # Keep spec in reliable bucket but don't run in blocking pipelines
-  RSpec.describe 'Manage', :github, :reliable, :skip_live_env, :requires_admin do
+  RSpec.describe 'Manage', :github, :reliable, :skip_live_env, :requires_admin, product_group: :import do
     describe 'Project import', issue: 'https://gitlab.com/gitlab-org/gitlab/-/issues/353583' do
       let!(:api_client) { Runtime::API::Client.as_admin }
       let!(:group) { Resource::Group.fabricate_via_api! { |resource| resource.api_client = api_client } }

qa/qa/specs/features/api/1_manage/import/import_large_github_repo_spec.rb

@@ -7,7 +7,7 @@ require "etc"
 # rubocop:disable Rails/Pluck
 module QA
   RSpec.describe 'Manage', :github, requires_admin: 'creates users', only: { job: 'large-github-import' } do
-    describe 'Project import' do # rubocop:disable RSpec/MultipleMemoizedHelpers
+    describe 'Project import', product_group: :import do # rubocop:disable RSpec/MultipleMemoizedHelpers
       let(:github_repo) { ENV['QA_LARGE_IMPORT_REPO'] || 'rspec/rspec-core' }
       let(:import_max_duration) { ENV['QA_LARGE_IMPORT_DURATION']&.to_i || 7200 }
       let(:logger) { Runtime::Logger.logger }

qa/qa/specs/features/api/1_manage/migration/gitlab_migration_group_spec.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module QA
-  RSpec.describe 'Manage', :reliable, :requires_admin do
+  RSpec.describe 'Manage', :reliable, :requires_admin, product_group: :import do
     describe 'Gitlab migration' do
       let(:import_wait_duration) { { max_duration: 300, sleep_interval: 2 } }
       let(:admin_api_client) { Runtime::API::Client.as_admin }

qa/qa/specs/features/api/1_manage/migration/gitlab_migration_issue_spec.rb

@@ -4,7 +4,7 @@ require_relative 'gitlab_project_migration_common'
 
 module QA
   RSpec.describe 'Manage' do
-    describe 'Gitlab migration' do
+    describe 'Gitlab migration', product_group: :import do
       include_context 'with gitlab project migration'
 
       let!(:source_issue) do

qa/qa/specs/features/api/1_manage/migration/gitlab_migration_large_project_spec.rb

@@ -5,7 +5,7 @@
 # rubocop:disable Rails/Pluck, Layout/LineLength, RSpec/MultipleMemoizedHelpers
 module QA
   RSpec.describe "Manage", requires_admin: 'creates users', only: { job: 'large-gitlab-import' } do
-    describe "Gitlab migration" do
+    describe "Gitlab migration", product_group: :import do
       let(:logger) { Runtime::Logger.logger }
       let(:differ) { RSpec::Support::Differ.new(color: true) }
       let(:gitlab_group) { ENV['QA_LARGE_IMPORT_GROUP'] || 'gitlab-migration' }

qa/qa/specs/features/api/1_manage/migration/gitlab_migration_members_spec.rb

@@ -4,7 +4,7 @@ require_relative 'gitlab_project_migration_common'
 
 module QA
   RSpec.describe 'Manage' do
-    describe 'Gitlab migration' do
+    describe 'Gitlab migration', product_group: :import do
       include_context 'with gitlab project migration'
 
       let(:member) do

qa/qa/specs/features/api/1_manage/migration/gitlab_migration_mr_spec.rb

@@ -4,7 +4,7 @@ require_relative 'gitlab_project_migration_common'
 
 module QA
   RSpec.describe 'Manage' do
-    describe 'Gitlab migration' do
+    describe 'Gitlab migration', product_group: :import do
       include_context 'with gitlab project migration'
 
       context 'with merge request' do

qa/qa/specs/features/api/1_manage/migration/gitlab_migration_pipeline_spec.rb

@@ -4,7 +4,7 @@ require_relative 'gitlab_project_migration_common'
 
 module QA
   RSpec.describe 'Manage' do
-    describe 'Gitlab migration' do
+    describe 'Gitlab migration', product_group: :import do
       include_context 'with gitlab project migration'
 
       context 'with ci pipeline' do

qa/qa/specs/features/api/1_manage/migration/gitlab_migration_project_spec.rb

@@ -4,7 +4,7 @@ require_relative 'gitlab_project_migration_common'
 
 module QA
   RSpec.describe 'Manage' do
-    describe 'Gitlab migration' do
+    describe 'Gitlab migration', product_group: :import do
       include_context 'with gitlab project migration'
 
       context 'with uninitialized project' do

qa/qa/specs/features/api/1_manage/migration/gitlab_migration_release_spec.rb

@@ -4,7 +4,7 @@ require_relative 'gitlab_project_migration_common'
 
 module QA
   RSpec.describe 'Manage' do
-    describe 'Gitlab migration' do
+    describe 'Gitlab migration', product_group: :import do
       include_context 'with gitlab project migration'
 
       context 'with release' do

qa/qa/specs/features/browser_ui/1_manage/group/gitlab_migration_group_spec.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module QA
-  describe 'Manage', :requires_admin, :reliable do
+  describe 'Manage', :requires_admin, :reliable, product_group: :import do
     describe 'Gitlab migration' do
       let!(:admin_api_client) { Runtime::API::Client.as_admin }
       let!(:user) do

qa/qa/specs/features/browser_ui/1_manage/project/import_github_repo_spec.rb

@@ -3,7 +3,7 @@
 module QA
   # Spec uses real github.com, which means outage of github can actually block deployment
   # Keep spec in reliable bucket but don't run in blocking pipelines
-  RSpec.describe 'Manage', :github, :reliable, :skip_live_env, :requires_admin do
+  RSpec.describe 'Manage', :github, :reliable, :skip_live_env, :requires_admin, product_group: :import do
     describe 'Project import' do
       let(:github_repo) { 'gitlab-qa-github/import-test' }
       let(:api_client) { Runtime::API::Client.as_admin }