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 /lib/api/api.rb | |
| 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 'lib/api/api.rb')
0 files changed, 0 insertions, 0 deletions