Add latest changes from gitlab-org/gitlab@master

4 files changed, 6 insertions, 8 deletions

diff --git a/spec/serializers/ci/lint/job_entity_spec.rb b/spec/serializers/ci/lint/job_entity_spec.rb
index 2ef86cfd004..e1477612ad5 100644
--- a/spec/serializers/ci/lint/job_entity_spec.rb
+++ b/spec/serializers/ci/lint/job_entity_spec.rb
@@ -10,7 +10,7 @@ RSpec.describe Ci::Lint::JobEntity, :aggregate_failures do
         stage: 'test',
         before_script: ['bundle install', 'bundle exec rake db:create'],
         script: ["rake spec"],
-        after_script:  ["rake spec"],
+        after_script: ["rake spec"],
         tag_list: %w[ruby postgres],
         environment: { name: 'hello', url: 'world' },
         when: 'on_success',
diff --git a/spec/serializers/container_repository_entity_spec.rb b/spec/serializers/container_repository_entity_spec.rb
index 9ea00bc79e1..00e6a26d0be 100644
--- a/spec/serializers/container_repository_entity_spec.rb
+++ b/spec/serializers/container_repository_entity_spec.rb
@@ -14,8 +14,7 @@ RSpec.describe ContainerRepositoryEntity do
 
   before do
     stub_container_registry_config(enabled: true)
-    stub_container_registry_tags(repository: :any,
-      tags: %w[stable latest])
+    stub_container_registry_tags(repository: :any, tags: %w[stable latest])
     allow(request).to receive(:project).and_return(project)
     allow(request).to receive(:current_user).and_return(user)
   end
diff --git a/spec/serializers/deployment_entity_spec.rb b/spec/serializers/deployment_entity_spec.rb
index a017f7523e9..433ce344680 100644
--- a/spec/serializers/deployment_entity_spec.rb
+++ b/spec/serializers/deployment_entity_spec.rb
@@ -61,8 +61,7 @@ RSpec.describe DeploymentEntity do
 
   context 'when the pipeline has another manual action' do
     let!(:other_build) do
-      create(:ci_build, :manual, name: 'another deploy',
-             pipeline: pipeline, environment: build.environment)
+      create(:ci_build, :manual, name: 'another deploy', pipeline: pipeline, environment: build.environment)
     end
 
     let!(:other_deployment) { create(:deployment, deployable: build) }
diff --git a/spec/serializers/merge_request_metrics_helper_spec.rb b/spec/serializers/merge_request_metrics_helper_spec.rb
index 8f683df1faa..ec764bf7853 100644
--- a/spec/serializers/merge_request_metrics_helper_spec.rb
+++ b/spec/serializers/merge_request_metrics_helper_spec.rb
@@ -57,9 +57,9 @@ RSpec.describe MergeRequestMetricsHelper do
 
         expect(MergeRequest::Metrics).to receive(:new)
             .with(latest_closed_at: closed_event&.updated_at,
-              latest_closed_by: closed_event&.author,
-              merged_at: merge_event&.updated_at,
-              merged_by: merge_event&.author)
+                  latest_closed_by: closed_event&.author,
+                  merged_at: merge_event&.updated_at,
+                  merged_by: merge_event&.author)
             .and_call_original
 
         subject