diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-10-16 19:58:01 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-10-16 19:58:01 +0000 |
| commit | dabf8a8dcd1a1c52ae257f64fc469160a51669bd (patch) | |
| tree | 042b2cc595249cda16ded42ce15ca2815174a6bd /spec | |
| parent | 11da7594c1d84618df2c077ffeadb9537125c16d (diff) | |
| parent | 9e30b75e9c5ab91de955b6212df825f5e85c0e57 (diff) | |
| download | gitlab-ce-dabf8a8dcd1a1c52ae257f64fc469160a51669bd.tar.gz | |
Merge branch 'fix-merge-request-diff-spinach-failures' into 'master'
Fix Spinach merge request diff failures
gitlab-git-test `master` was updated in ff076d88, and this caused the merge request diffs to change in a way that broke assumptions in the Spinach tests.
Partial fix to #23378
See merge request !6916
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/support/test_env.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/spec/support/test_env.rb b/spec/support/test_env.rb index d56274d0979..ad8ae763f6d 100644 --- a/spec/support/test_env.rb +++ b/spec/support/test_env.rb @@ -17,6 +17,7 @@ module TestEnv 'markdown' => '0ed8c6c', 'lfs' => 'be93687', 'master' => 'b83d6e3', + 'merge-test' => '5937ac0', "'test'" => 'e56497b', 'orphaned-branch' => '45127a9', 'binary-encoding' => '7b1cf43', |