diff options
| author | Stan Hu <stanhu@gmail.com> | 2016-08-28 06:59:48 +0300 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-11-14 17:57:01 +0300 |
| commit | 0f61bb2dc5298a7e06f8e211adcf46dd282b9c86 (patch) | |
| tree | 3e5d555919ae02c30bb8519cc898d8a256f75e9a /changelogs | |
| parent | 36fa5d660df96c49484cd27695da1df6e361eb8f (diff) | |
Fix Error 500 when creating a merge request that contains an image that was deleted and added
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 'changelogs')
| -rw-r--r-- | changelogs/unreleased/stanhu-gitlab-ce-fix-error-500-with-mr-images.yml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/changelogs/unreleased/stanhu-gitlab-ce-fix-error-500-with-mr-images.yml b/changelogs/unreleased/stanhu-gitlab-ce-fix-error-500-with-mr-images.yml new file mode 100644 index 00000000000..7ca0d5fb19e --- /dev/null +++ b/changelogs/unreleased/stanhu-gitlab-ce-fix-error-500-with-mr-images.yml @@ -0,0 +1,4 @@ +--- +title: Fix Error 500 when creating a merge request that contains an image that was deleted and added +merge_request: 7457 +author: |