gitlab-org--gitlab-foss/app
Stan Hu 0f61bb2dc5
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>
2016-11-14 15:57:01 +01:00
..
assets Merge branch '22307-pipeline-link-in-builds-view' into 'master' 2016-11-13 17:28:38 +00:00
controllers Merge branch 'fix-help-page-links' into 'master' 2016-11-14 10:45:56 +00:00
finders Merge branch '22481-honour-issue-visibility-for-groups' into 'security' 2016-11-09 12:24:13 +01:00
helpers Merge branch 'user_filter_auth' into 'master' 2016-11-14 10:23:21 +00:00
mailers Merge remote-tracking branch 'upstream/master' into pipeline-notifications 2016-11-08 23:52:17 +08:00
models Merge branch 'sh-fix-sidekiq-throttling-init' into 'master' 2016-11-14 10:29:45 +00:00
policies Merge branch 'pipeline-notifications' into 'master' 2016-11-09 13:41:04 +00:00
serializers Simplify implementation of entity serializers 2016-11-04 15:00:39 +01:00
services Does not raise error when Note not found when processing NewNoteWorker 2016-11-11 22:54:11 -02:00
uploaders
validators Add robots.txt to the list of reserved namespaces 2016-10-11 02:58:26 +01:00
views Fix Error 500 when creating a merge request that contains an image that was deleted and added 2016-11-14 15:57:01 +01:00
workers Does not raise error when Note not found when processing NewNoteWorker 2016-11-11 22:54:11 -02:00