Add latest changes from gitlab-org/gitlab@master

3 files changed, 13 insertions, 13 deletions

diff --git a/spec/factories/ci/builds.rb b/spec/factories/ci/builds.rb
index d684f79a518..8c2edc8cd9f 100644
--- a/spec/factories/ci/builds.rb
+++ b/spec/factories/ci/builds.rb
@@ -129,8 +129,8 @@ FactoryBot.define do
         {
           script: %w(ls),
           environment: { name: 'staging',
-            action: 'stop',
-            url: 'http://staging.example.com/$CI_JOB_NAME' }
+                         action: 'stop',
+                         url: 'http://staging.example.com/$CI_JOB_NAME' }
         }
       end
     end
@@ -141,9 +141,9 @@ FactoryBot.define do
         {
           script: %w(ls),
           environment: { name: 'test_portal',
-            action: 'start',
-            url: 'http://staging.example.com/$CI_JOB_NAME',
-            deployment_tier: 'testing' }
+                         action: 'start',
+                         url: 'http://staging.example.com/$CI_JOB_NAME',
+                         deployment_tier: 'testing' }
         }
       end
     end
@@ -155,7 +155,7 @@ FactoryBot.define do
         {
           script: %w(ls),
           environment: { name: 'production',
-            url: 'http://prd.example.com/$CI_JOB_NAME' }
+                         url: 'http://prd.example.com/$CI_JOB_NAME' }
         }
       end
     end
@@ -167,8 +167,8 @@ FactoryBot.define do
         {
           script: %w(ls),
           environment: { name: 'review/$CI_COMMIT_REF_NAME',
-            url: 'http://staging.example.com/$CI_JOB_NAME',
-            on_stop: 'stop_review_app' }
+                         url: 'http://staging.example.com/$CI_JOB_NAME',
+                         on_stop: 'stop_review_app' }
         }
       end
     end
@@ -181,8 +181,8 @@ FactoryBot.define do
         {
           script: %w(ls),
           environment: { name: 'review/$CI_COMMIT_REF_NAME',
-            url: 'http://staging.example.com/$CI_JOB_NAME',
-            action: 'stop' }
+                         url: 'http://staging.example.com/$CI_JOB_NAME',
+                         action: 'stop' }
         }
       end
     end
diff --git a/spec/factories/environments.rb b/spec/factories/environments.rb
index ccd2011eb8d..34843dab0fe 100644
--- a/spec/factories/environments.rb
+++ b/spec/factories/environments.rb
@@ -47,7 +47,7 @@ FactoryBot.define do
         pipeline = create(:ci_pipeline, project: environment.project)
 
         deployable = create(:ci_build, :success, name: "#{environment.name}:deploy",
-                                       pipeline: pipeline)
+                                                 pipeline: pipeline)
 
         deployment = create(:deployment,
                             :success,
diff --git a/spec/factories/groups.rb b/spec/factories/groups.rb
index 152ae061605..6f9cf0ef895 100644
--- a/spec/factories/groups.rb
+++ b/spec/factories/groups.rb
@@ -106,9 +106,9 @@ FactoryBot.define do
         end
 
         create_graph(
-          parent:   group,
+          parent: group,
           children: evaluator.children,
-          depth:    evaluator.depth
+          depth: evaluator.depth
         )
       end
     end