diff options
| author | Stan Hu <stanhu@gmail.com> | 2016-10-15 14:49:20 -0700 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2016-10-15 15:28:30 -0700 |
| commit | 5a8738a7b43ae567829bca36db6f13f430b56c83 (patch) | |
| tree | 228cb483e5a8ad945a521cdf02ed1af0cd3af08c /spec/support | |
| parent | a65394f35cc83f342e9b2c654cfb32d3eb4c45e7 (diff) | |
| download | gitlab-ce-5a8738a7b43ae567829bca36db6f13f430b56c83.tar.gz | |
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
Diffstat (limited to 'spec/support')
| -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', |