gitlab-org--gitlab-foss/spec
Douwe Maan fdd7e3f6e9 Merge branch 'stanhu/gitlab-ce-fix-error-500-with-mr-images' into 'master'
Fix Error 500 when creating a merge request that contains an image that was deleted and added

_Originally opened at !4816 by @stanhu._

- - -

## What does this MR do?

This MR fixes an Error 500 when creating a merge request that contains an image that was deleted and added. Before, when displaying the before and after image, the code would always retrieve the image from the parent commit. However, in a diff, this could cause two different problems:
The "before" image may not actually be the image you want to compare against (regression of #14327)
It may appear as though a file was modified when it was really just added during the diff

## Are there points in the code the reviewer needs to double check?

There may be a more elegant to fix this bug.

## What are the relevant issue numbers?

Closes #3893, gitlab-org/gitlab-ee#678

See merge request !7457
2016-11-15 10:22:36 +00:00
..
bin
config
controllers Merge branch 'fix-help-page-links' into 'master' 2016-11-14 10:45:56 +00:00
factories Merge branch 'fix-unathorized-cloning' into 'security' 2016-11-09 12:27:17 +01:00
features Merge branch 'stanhu/gitlab-ce-fix-error-500-with-mr-images' into 'master' 2016-11-15 10:22:36 +00:00
finders
fixtures
helpers Merge branch 'remove-heading-space-from-diff-content' into 'master' 2016-11-09 15:32:02 +00:00
initializers
javascripts Merge branch 'improve-build-scroll-controls-responsive-behaviour' into 'master' 2016-11-08 21:41:48 +00:00
lib Merge branch 'stanhu/gitlab-ce-fix-error-500-with-mr-images' into 'master' 2016-11-15 10:22:36 +00:00
mailers
models Merge branch 'fix/error-when-invalid-branch-for-new-pipeline-used' into 'master' 2016-11-10 14:00:55 +00:00
policies
requests Update 8.14-rc1 migrations to minimize downtime and deploy time 2016-11-11 15:34:00 -03:00
routing Fix routing spec for group controller 2016-11-08 15:54:17 +02:00
serializers
services Does not raise error when Note not found when processing NewNoteWorker 2016-11-11 22:54:11 -02:00
support 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
tasks/gitlab Introduce better credential and error checking to `rake gitlab:ldap:check` 2016-11-08 15:46:10 -06:00
uploaders
views add tests for build row templates 2016-11-10 16:38:00 -06:00
workers Does not raise error when Note not found when processing NewNoteWorker 2016-11-11 22:54:11 -02:00
factories_spec.rb
rails_helper.rb
rake_helper.rb
simplecov_env.rb
spec_helper.rb Fix broken commits search 2016-11-08 12:03:23 +02:00
teaspoon_env.rb