Add latest changes from gitlab-org/gitlab@master

10 files changed, 30 insertions, 34 deletions

diff --git a/qa/qa/specs/features/api/12_systems/gitaly/changing_repository_storage_spec.rb b/qa/qa/specs/features/api/12_systems/gitaly/changing_repository_storage_spec.rb
index 01c50c0cd6a..425ab0fa162 100644
--- a/qa/qa/specs/features/api/12_systems/gitaly/changing_repository_storage_spec.rb
+++ b/qa/qa/specs/features/api/12_systems/gitaly/changing_repository_storage_spec.rb
@@ -30,7 +30,7 @@ module QA
       end
 
       context 'when moving from one Gitaly storage to another', :orchestrated, :repository_storage,
-              testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347827' do
+        testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347827' do
         let(:source_storage) { { type: :gitaly, name: 'default' } }
         let(:destination_storage) { { type: :gitaly, name: QA::Runtime::Env.additional_repository_storage } }
         let(:project) do
@@ -52,7 +52,7 @@ module QA
       # scenario with other tests that aren't considered orchestrated.
       # It also runs on staging using nfs-file07 as non-cluster storage and nfs-file22 as cluster/praefect storage
       context 'when moving from Gitaly to Gitaly Cluster', :requires_praefect,
-              testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347828' do
+        testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347828' do
         let(:source_storage) { { type: :gitaly, name: QA::Runtime::Env.non_cluster_repository_storage } }
         let(:destination_storage) { { type: :praefect, name: QA::Runtime::Env.praefect_repository_storage } }
         let(:project) do
@@ -75,7 +75,7 @@ module QA
       # scenario with other tests that aren't considered orchestrated.
       # It also runs on staging using nfs-file07 as non-cluster storage and nfs-file22 as cluster/praefect storage
       context 'when moving from Gitaly Cluster to Gitaly', :requires_praefect,
-              testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/369204' do
+        testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/369204' do
         let(:source_storage) { { type: :praefect, name: QA::Runtime::Env.praefect_repository_storage } }
         let(:destination_storage) { { type: :gitaly, name: QA::Runtime::Env.non_cluster_repository_storage } }
         let(:project) do
diff --git a/qa/qa/specs/features/api/12_systems/gitaly/distributed_reads_spec.rb b/qa/qa/specs/features/api/12_systems/gitaly/distributed_reads_spec.rb
index 60ce2a65fd1..a3d0fc7f72f 100644
--- a/qa/qa/specs/features/api/12_systems/gitaly/distributed_reads_spec.rb
+++ b/qa/qa/specs/features/api/12_systems/gitaly/distributed_reads_spec.rb
@@ -28,8 +28,7 @@ module QA
           praefect_manager.query_read_distribution.each_with_index do |data, index|
             pre_read_count = praefect_manager.value_for_node(pre_read_data, data[:node])
             QA::Runtime::Logger.debug("Node: #{data[:node]}; before: #{pre_read_count}; now: #{data[:value]}")
-            expect(data[:value]).to be > pre_read_count,
-                                    "Read counts did not differ for node #{data[:node]}"
+            expect(data[:value]).to be > pre_read_count, "Read counts did not differ for node #{data[:node]}"
           end
         end
       end
@@ -45,7 +44,7 @@ module QA
         end
 
         it 'does not read from the unhealthy node',
-           testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347834' do
+          testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347834' do
           pre_read_data = praefect_manager.query_read_distribution
 
           read_from_project(project, number_of_reads_per_loop * 10)
diff --git a/qa/qa/specs/features/api/12_systems/gitaly/praefect_connectivity_spec.rb b/qa/qa/specs/features/api/12_systems/gitaly/praefect_connectivity_spec.rb
index bd00b3781f7..7692e0f1d01 100644
--- a/qa/qa/specs/features/api/12_systems/gitaly/praefect_connectivity_spec.rb
+++ b/qa/qa/specs/features/api/12_systems/gitaly/praefect_connectivity_spec.rb
@@ -11,25 +11,25 @@ module QA
 
       context 'in a healthy environment' do
         it 'confirms healthy connection to database',
-           testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/349937' do
+          testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/349937' do
           expect(praefect_manager.praefect_sql_ping_healthy?).to be true
         end
 
         it 'confirms healthy connection to gitaly nodes',
-           testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/349938' do
+          testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/349938' do
           expect(praefect_manager.wait_for_dial_nodes_successful).to be true
         end
       end
 
       context 'in an unhealthy environment' do
         it 'diagnoses unhealthy connection to database',
-           testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/349939' do
+          testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/349939' do
           praefect_manager.stop_node(praefect_manager.postgres)
           expect(praefect_manager.praefect_sql_ping_healthy?).to be false
         end
 
         it 'diagnoses connection issues to gitaly nodes',
-           testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/349940' do
+          testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/349940' do
           praefect_manager.stop_node(praefect_manager.primary_node)
           praefect_manager.stop_node(praefect_manager.tertiary_node)
           expect(praefect_manager.praefect_dial_nodes_status?(praefect_manager.primary_node, false)).to be true
diff --git a/qa/qa/specs/features/api/12_systems/gitaly/praefect_dataloss_spec.rb b/qa/qa/specs/features/api/12_systems/gitaly/praefect_dataloss_spec.rb
index cf387c14006..7b9164c1fc9 100644
--- a/qa/qa/specs/features/api/12_systems/gitaly/praefect_dataloss_spec.rb
+++ b/qa/qa/specs/features/api/12_systems/gitaly/praefect_dataloss_spec.rb
@@ -17,14 +17,14 @@ module QA
       end
 
       it 'confirms that changes are synced across all storages',
-         testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/352691' do
+        testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/352691' do
         expect { praefect_manager.praefect_dataloss_information(project.id) }
-        .to(eventually_include('All repositories are fully available on all assigned storages!')
-        .within(max_duration: 60))
+          .to(eventually_include('All repositories are fully available on all assigned storages!')
+          .within(max_duration: 60))
       end
 
       it 'identifies how many changes are not in sync across storages',
-         testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/352692' do
+        testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/352692' do
         # Ensure our test repository is replicated and in a consistent state prior to test
         praefect_manager.wait_for_project_synced_across_all_storages(project.id)
 
@@ -59,7 +59,7 @@ module QA
       end
 
       it 'allows admin resolve scenario where data cannot be recovered',
-         testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/352708' do
+        testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/352708' do
         # Ensure everything is in sync before begining test
         praefect_manager.wait_for_project_synced_across_all_storages(project.id)
 
diff --git a/qa/qa/specs/features/api/12_systems/gitaly/praefect_replication_queue_spec.rb b/qa/qa/specs/features/api/12_systems/gitaly/praefect_replication_queue_spec.rb
index f88372c0b59..88e746bfefe 100644
--- a/qa/qa/specs/features/api/12_systems/gitaly/praefect_replication_queue_spec.rb
+++ b/qa/qa/specs/features/api/12_systems/gitaly/praefect_replication_queue_spec.rb
@@ -23,7 +23,7 @@ module QA
       end
 
       it 'allows replication of different repository after interruption',
-         testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347829' do
+        testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347829' do
         # We want to fill the replication queue with 10 `in_progress` jobs,
         # while a lock has been acquired, which is when the problem occurred
         # as reported in https://gitlab.com/gitlab-org/gitaly/-/issues/2801
diff --git a/qa/qa/specs/features/api/12_systems/gitaly/praefect_repo_sync_spec.rb b/qa/qa/specs/features/api/12_systems/gitaly/praefect_repo_sync_spec.rb
index 40fc6bf2637..4f916300ee3 100644
--- a/qa/qa/specs/features/api/12_systems/gitaly/praefect_repo_sync_spec.rb
+++ b/qa/qa/specs/features/api/12_systems/gitaly/praefect_repo_sync_spec.rb
@@ -27,7 +27,7 @@ module QA
       end
 
       it 'allows admin to manage difference between praefect database and disk state',
-         testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347606' do
+        testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347606' do
         # Some repos are on disk that praefect is not aware of
         untracked_repositories = praefect_manager.list_untracked_repositories
         expect(untracked_repositories).to include(repo1)
@@ -77,7 +77,7 @@ module QA
       end
 
       it 'allows admin to control the number of replicas of data',
-         testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347566' do
+        testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347566' do
         praefect_manager
           .track_repository_in_praefect(repo1['relative_path'], repo1['storage'], repo1['virtual_storage'])
 
diff --git a/qa/qa/specs/features/api/1_manage/integrations/webhook_events_spec.rb b/qa/qa/specs/features/api/1_manage/integrations/webhook_events_spec.rb
index 53c81b0e187..783c3a65c7d 100644
--- a/qa/qa/specs/features/api/1_manage/integrations/webhook_events_spec.rb
+++ b/qa/qa/specs/features/api/1_manage/integrations/webhook_events_spec.rb
@@ -112,10 +112,10 @@ module QA
         let(:disabled_after) { 4 }
 
         it 'hook is auto-disabled',
-           testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/389595', quarantine: {
-             issue: 'https://gitlab.com/gitlab-org/gitlab/-/issues/393274',
-             type: :investigating
-           } do
+          testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/389595', quarantine: {
+            issue: 'https://gitlab.com/gitlab-org/gitlab/-/issues/393274',
+            type: :investigating
+          } do
           Resource::ProjectWebHook.setup(fail_mock, session: session, issues: true) do |webhook, smocker|
             hook_trigger_times.times do
               Resource::Issue.fabricate_via_api! do |issue_init|
diff --git a/qa/qa/specs/features/api/3_create/repository/project_archive_compare_spec.rb b/qa/qa/specs/features/api/3_create/repository/project_archive_compare_spec.rb
index a211eb6042d..d72672e2104 100644
--- a/qa/qa/specs/features/api/3_create/repository/project_archive_compare_spec.rb
+++ b/qa/qa/specs/features/api/3_create/repository/project_archive_compare_spec.rb
@@ -6,7 +6,7 @@ require 'digest'
 module QA
   RSpec.describe 'Create' do
     describe 'Compare archives of different user projects with the same name and check they\'re different',
-             product_group: :source_code do
+      product_group: :source_code do
       include Support::API
       let(:project_name) { "project-archive-download-#{SecureRandom.hex(8)}" }
 
diff --git a/qa/qa/specs/features/api/3_create/repository/tag_revision_trigger_prereceive_hook_spec.rb b/qa/qa/specs/features/api/3_create/repository/tag_revision_trigger_prereceive_hook_spec.rb
index b34b4208337..700cf69da80 100644
--- a/qa/qa/specs/features/api/3_create/repository/tag_revision_trigger_prereceive_hook_spec.rb
+++ b/qa/qa/specs/features/api/3_create/repository/tag_revision_trigger_prereceive_hook_spec.rb
@@ -19,14 +19,13 @@ module QA
           end
 
           it 'returns a custom server hook error',
-             :skip_live_env,
-             except: { job: 'review-qa-*' },
-             testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/369053' do
+            :skip_live_env,
+            except: { job: 'review-qa-*' },
+            testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/369053' do
             expect { project.create_repository_tag('v1.2.3') }
-              .to raise_error
-                    .with_message(
-                      /rejecting prereceive hook for projects with GL_PROJECT_PATH matching pattern reject-prereceive/
-                    )
+              .to raise_error.with_message(
+                /rejecting prereceive hook for projects with GL_PROJECT_PATH matching pattern reject-prereceive/
+              )
           end
         end
       end
diff --git a/qa/qa/specs/features/api/4_verify/api_variable_inheritance_with_forward_pipeline_variables_spec.rb b/qa/qa/specs/features/api/4_verify/api_variable_inheritance_with_forward_pipeline_variables_spec.rb
index c66bd16afe9..79974828a2b 100644
--- a/qa/qa/specs/features/api/4_verify/api_variable_inheritance_with_forward_pipeline_variables_spec.rb
+++ b/qa/qa/specs/features/api/4_verify/api_variable_inheritance_with_forward_pipeline_variables_spec.rb
@@ -70,15 +70,13 @@ module QA
       def expect_downstream_pipeline_to_inherit_variable
         pipeline = downstream_pipeline(upstream_project, 'child1_trigger')
         expect(pipeline).to have_variable(key: key, value: value),
-                            "Expected to find `{key: 'TEST_VAR', value: 'This is great!'}`" \
-            " but got #{pipeline.pipeline_variables}"
+          "Expected to find `{key: 'TEST_VAR', value: 'This is great!'}` but got #{pipeline.pipeline_variables}"
       end
 
       def expect_downstream_pipeline_not_to_inherit_variable(project, bridge_name)
         pipeline = downstream_pipeline(project, bridge_name)
         expect(pipeline).not_to have_variable(key: key, value: value),
-                                "Did not expect to find `{key: 'TEST_VAR', value: 'This is great!'}`" \
-            " but got #{pipeline.pipeline_variables}"
+          "Did not expect to find `{key: 'TEST_VAR', value: 'This is great!'}` but got #{pipeline.pipeline_variables}"
       end
     end
   end