diff options
| author | Stan Hu <stanhu@gmail.com> | 2016-08-27 20:59:48 -0700 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-11-14 15:57:01 +0100 |
| commit | 0f61bb2dc5298a7e06f8e211adcf46dd282b9c86 (patch) | |
| tree | 3e5d555919ae02c30bb8519cc898d8a256f75e9a /spec/support/test_env.rb | |
| parent | 36fa5d660df96c49484cd27695da1df6e361eb8f (diff) | |
| download | gitlab-ce-0f61bb2dc5298a7e06f8e211adcf46dd282b9c86.tar.gz | |
Fix Error 500 when creating a merge request that contains an image that was deleted and addedstanhu/gitlab-ce-fix-error-500-with-mr-images
Steps to reproduce:
1. Start with a repo with an image
2. Add a commit to delete the image
3. Add another commit to replace the image with another image
In a diff comparison, we really just compare about what the image was before the diff, not
the direct parent of the last commit. This MR fixes that.
Closes #3893, gitlab-org/gitlab-ee#678
Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'spec/support/test_env.rb')
| -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 103f7542286..4cf81be3adc 100644 --- a/spec/support/test_env.rb +++ b/spec/support/test_env.rb @@ -35,6 +35,7 @@ module TestEnv 'conflict-missing-side' => 'eb227b3', 'conflict-non-utf8' => 'd0a293c', 'conflict-too-large' => '39fa04f', + 'deleted-image-test' => '6c17798' } # gitlab-test-fork is a fork of gitlab-fork, but we don't necessarily |