gitlab-org--gitlab-foss/spec/lib
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
..
banzai Merge branch 'markdown-xss-fix-option-2.1' into 'security' 2016-11-09 12:26:44 +01:00
ci Add logical validation to gitlab-ci.yml 2016-10-18 12:22:51 +02:00
constraints Add small improvements to constrainers and specs 2016-11-08 14:32:42 +02:00
container_registry Explicitly remove authorization token and make sure that invalid addresses are properly handled 2016-07-15 17:35:23 +02:00
gitlab Merge branch 'stanhu/gitlab-ce-fix-error-500-with-mr-images' into 'master' 2016-11-15 10:22:36 +00:00
json_web_token Revert "Fix merge conflicts - squashed commit" 2016-06-03 11:10:17 +02:00
disable_email_interceptor_spec.rb adds second batch of tests changed to active tense 2016-08-09 15:11:39 +01:00
event_filter_spec.rb Fix inconsistent highlighting of already selected activity nav-links 2016-10-05 15:38:18 -05:00
expand_variables_spec.rb Verify expandability of variables defined as part of environment 2016-09-19 10:07:13 +02:00
extracts_path_spec.rb Allow browsing branches that end with '.atom' 2016-10-11 13:31:12 +01:00
file_size_validator_spec.rb
git_ref_validator_spec.rb
gitlab_spec.rb Update Gitlab.com? to support staging 2016-06-27 15:10:36 -04:00
repository_cache_spec.rb Use project ID in repository cache to prevent stale data from persisting across projects 2016-07-25 05:09:28 -07:00