Add latest changes from gitlab-org/gitlab@master

1 files changed, 81 insertions, 81 deletions

diff --git a/spec/support/helpers/test_env.rb b/spec/support/helpers/test_env.rb
index 03e9ad1a08e..6f9027ea79a 100644
--- a/spec/support/helpers/test_env.rb
+++ b/spec/support/helpers/test_env.rb
@@ -10,85 +10,85 @@ module TestEnv
 
   # When developing the seed repository, comment out the branch you will modify.
   BRANCH_SHA = {
-    'signed-commits'                     => 'c7794c1',
-    'not-merged-branch'                  => 'b83d6e3',
-    'branch-merged'                      => '498214d',
-    'empty-branch'                       => '7efb185',
-    'ends-with.json'                     => '98b0d8b',
-    'flatten-dir'                        => 'e56497b',
-    'feature'                            => '0b4bc9a',
-    'feature_conflict'                   => 'bb5206f',
-    'fix'                                => '48f0be4',
-    'improve/awesome'                    => '5937ac0',
-    'merged-target'                      => '21751bf',
-    'markdown'                           => '0ed8c6c',
-    'lfs'                                => '55bc176',
-    'master'                             => 'b83d6e3',
-    'merge-test'                         => '5937ac0',
-    "'test'"                             => 'e56497b',
-    'orphaned-branch'                    => '45127a9',
-    'binary-encoding'                    => '7b1cf43',
-    'gitattributes'                      => '5a62481',
-    'expand-collapse-diffs'              => '4842455',
-    'symlink-expand-diff'                => '81e6355',
-    'diff-files-symlink-to-image'        => '8cfca84',
-    'diff-files-image-to-symlink'        => '3e94fda',
-    'diff-files-symlink-to-text'         => '689815e',
-    'diff-files-text-to-symlink'         => '5e2c270',
-    'expand-collapse-files'              => '025db92',
-    'expand-collapse-lines'              => '238e82d',
-    'pages-deploy'                       => '7897d5b',
-    'pages-deploy-target'                => '7975be0',
-    'audio'                              => 'c3c21fd',
-    'video'                              => '8879059',
-    'crlf-diff'                          => '5938907',
-    'conflict-start'                     => '824be60',
-    'conflict-resolvable'                => '1450cd6',
-    'conflict-binary-file'               => '259a6fb',
+    'signed-commits' => 'c7794c1',
+    'not-merged-branch' => 'b83d6e3',
+    'branch-merged' => '498214d',
+    'empty-branch' => '7efb185',
+    'ends-with.json' => '98b0d8b',
+    'flatten-dir' => 'e56497b',
+    'feature' => '0b4bc9a',
+    'feature_conflict' => 'bb5206f',
+    'fix' => '48f0be4',
+    'improve/awesome' => '5937ac0',
+    'merged-target' => '21751bf',
+    'markdown' => '0ed8c6c',
+    'lfs' => '55bc176',
+    'master' => 'b83d6e3',
+    'merge-test' => '5937ac0',
+    "'test'" => 'e56497b',
+    'orphaned-branch' => '45127a9',
+    'binary-encoding' => '7b1cf43',
+    'gitattributes' => '5a62481',
+    'expand-collapse-diffs' => '4842455',
+    'symlink-expand-diff' => '81e6355',
+    'diff-files-symlink-to-image' => '8cfca84',
+    'diff-files-image-to-symlink' => '3e94fda',
+    'diff-files-symlink-to-text' => '689815e',
+    'diff-files-text-to-symlink' => '5e2c270',
+    'expand-collapse-files' => '025db92',
+    'expand-collapse-lines' => '238e82d',
+    'pages-deploy' => '7897d5b',
+    'pages-deploy-target' => '7975be0',
+    'audio' => 'c3c21fd',
+    'video' => '8879059',
+    'crlf-diff' => '5938907',
+    'conflict-start' => '824be60',
+    'conflict-resolvable' => '1450cd6',
+    'conflict-binary-file' => '259a6fb',
     'conflict-contains-conflict-markers' => '78a3086',
-    'conflict-missing-side'              => 'eb227b3',
-    'conflict-non-utf8'                  => 'd0a293c',
-    'conflict-too-large'                 => '39fa04f',
-    'deleted-image-test'                 => '6c17798',
-    'wip'                                => 'b9238ee',
-    'csv'                                => '3dd0896',
-    'v1.1.0'                             => 'b83d6e3',
-    'add-ipython-files'                  => '4963fef',
-    'add-pdf-file'                       => 'e774ebd',
-    'squash-large-files'                 => '54cec52',
-    'add-pdf-text-binary'                => '79faa7b',
-    'add_images_and_changes'             => '010d106',
-    'update-gitlab-shell-v-6-0-1'        => '2f61d70',
-    'update-gitlab-shell-v-6-0-3'        => 'de78448',
-    'merge-commit-analyze-before'        => '1adbdef',
-    'merge-commit-analyze-side-branch'   => '8a99451',
-    'merge-commit-analyze-after'         => '646ece5',
-    'snippet/single-file'                => '43e4080aaa14fc7d4b77ee1f5c9d067d5a7df10e',
-    'snippet/multiple-files'             => '40232f7eb98b3f221886432def6e8bab2432add9',
-    'snippet/rename-and-edit-file'       => '220a1e4b4dff37feea0625a7947a4c60fbe78365',
-    'snippet/edit-file'                  => 'c2f074f4f26929c92795a75775af79a6ed6d8430',
-    'snippet/no-files'                   => '671aaa842a4875e5f30082d1ab6feda345fdb94d',
-    '2-mb-file'                          => 'bf12d25',
-    'before-create-delete-modify-move'   => '845009f',
-    'between-create-delete-modify-move'  => '3f5f443',
-    'after-create-delete-modify-move'    => 'ba3faa7',
-    'with-codeowners'                    => '219560e',
-    'submodule_inside_folder'            => 'b491b92',
-    'png-lfs'                            => 'fe42f41',
-    'sha-starting-with-large-number'     => '8426165',
-    'invalid-utf8-diff-paths'            => '99e4853',
-    'compare-with-merge-head-source'     => 'f20a03d',
-    'compare-with-merge-head-target'     => '2f1e176',
-    'trailers'                           => 'f0a5ed6',
-    'add_commit_with_5mb_subject'        => '8cf8e80',
-    'blame-on-renamed'                   => '32c33da',
-    'with-executables'                   => '6b8dc4a',
-    'spooky-stuff'                       => 'ba3343b',
-    'few-commits'                        => '0031876',
-    'two-commits'                        => '304d257',
-    'utf-16'                             => 'f05a987',
-    'gitaly-rename-test'                 => '94bb47c',
-    'smime-signed-commits'               => 'ed775cc'
+    'conflict-missing-side' => 'eb227b3',
+    'conflict-non-utf8' => 'd0a293c',
+    'conflict-too-large' => '39fa04f',
+    'deleted-image-test' => '6c17798',
+    'wip' => 'b9238ee',
+    'csv' => '3dd0896',
+    'v1.1.0' => 'b83d6e3',
+    'add-ipython-files' => '4963fef',
+    'add-pdf-file' => 'e774ebd',
+    'squash-large-files' => '54cec52',
+    'add-pdf-text-binary' => '79faa7b',
+    'add_images_and_changes' => '010d106',
+    'update-gitlab-shell-v-6-0-1' => '2f61d70',
+    'update-gitlab-shell-v-6-0-3' => 'de78448',
+    'merge-commit-analyze-before' => '1adbdef',
+    'merge-commit-analyze-side-branch' => '8a99451',
+    'merge-commit-analyze-after' => '646ece5',
+    'snippet/single-file' => '43e4080aaa14fc7d4b77ee1f5c9d067d5a7df10e',
+    'snippet/multiple-files' => '40232f7eb98b3f221886432def6e8bab2432add9',
+    'snippet/rename-and-edit-file' => '220a1e4b4dff37feea0625a7947a4c60fbe78365',
+    'snippet/edit-file' => 'c2f074f4f26929c92795a75775af79a6ed6d8430',
+    'snippet/no-files' => '671aaa842a4875e5f30082d1ab6feda345fdb94d',
+    '2-mb-file' => 'bf12d25',
+    'before-create-delete-modify-move' => '845009f',
+    'between-create-delete-modify-move' => '3f5f443',
+    'after-create-delete-modify-move' => 'ba3faa7',
+    'with-codeowners' => '219560e',
+    'submodule_inside_folder' => 'b491b92',
+    'png-lfs' => 'fe42f41',
+    'sha-starting-with-large-number' => '8426165',
+    'invalid-utf8-diff-paths' => '99e4853',
+    'compare-with-merge-head-source' => 'f20a03d',
+    'compare-with-merge-head-target' => '2f1e176',
+    'trailers' => 'f0a5ed6',
+    'add_commit_with_5mb_subject' => '8cf8e80',
+    'blame-on-renamed' => '32c33da',
+    'with-executables' => '6b8dc4a',
+    'spooky-stuff' => 'ba3343b',
+    'few-commits' => '0031876',
+    'two-commits' => '304d257',
+    'utf-16' => 'f05a987',
+    'gitaly-rename-test' => '94bb47c',
+    'smime-signed-commits' => 'ed775cc'
   }.freeze
 
   # gitlab-test-fork is a fork of gitlab-fork, but we don't necessarily
@@ -96,9 +96,9 @@ module TestEnv
   # We currently only need a subset of the branches
   FORKED_BRANCH_SHA = {
     'add-submodule-version-bump' => '3f547c0',
-    'master'                     => '5937ac0',
-    'remove-submodule'           => '2a33e0c',
-    'conflict-resolvable-fork'   => '404fa3f'
+    'master' => '5937ac0',
+    'remove-submodule' => '2a33e0c',
+    'conflict-resolvable-fork' => '404fa3f'
   }.freeze
 
   TMP_TEST_PATH = Rails.root.join('tmp', 'tests').freeze