Add latest changes from gitlab-org/gitlab@master

1 files changed, 8 insertions, 6 deletions

diff --git a/spec/support/helpers/test_env.rb b/spec/support/helpers/test_env.rb
index 4f85eef31fa..1bd468ccfc3 100644
--- a/spec/support/helpers/test_env.rb
+++ b/spec/support/helpers/test_env.rb
@@ -490,12 +490,14 @@ module TestEnv
     # The HEAD of the component_folder will be used as heuristic for the version
     # of the binaries, allowing to use Git to determine if HEAD is later than
     # the expected version. Note: Git considers HEAD to be an anchestor of HEAD.
-    _out, exit_status = Gitlab::Popen.popen(%W[
-      #{Gitlab.config.git.bin_path}
-      -C #{component_folder}
-      merge-base --is-ancestor
-      #{expected_version} HEAD
-])
+    _out, exit_status = Gitlab::Popen.popen(
+      %W[
+        #{Gitlab.config.git.bin_path}
+        -C #{component_folder}
+        merge-base --is-ancestor
+        #{expected_version} HEAD
+      ]
+    )
 
     exit_status == 0
   end