kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity
gitlab-org--gitlab-foss/spec/features
History
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
..
admin Make specs a bit faster 2016-11-01 14:46:59 +02:00
atom Issues atom feed url reflect filters on dashboard 2016-11-03 18:26:06 +01:00
boards Fixed issue boards when not logged in 2016-11-14 12:12:01 +00:00
dashboard Differentiate the expire from leave event 2016-10-20 00:26:45 +00:00
groups Merge branch '22481-honour-issue-visibility-for-groups' into 'security' 2016-11-09 12:24:13 +01:00
issuables Handle legacy sort order values 2016-08-18 23:26:07 +01:00
issues Merge branch 'issue_23548_dev' into 'master' 2016-11-09 12:25:17 +01:00
merge_requests 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
milestones Stop unauthorized users dragging on milestone page 2016-10-28 21:43:43 +11:00
profiles Convert "SSH Keys" Spinach features to RSpec 2016-10-03 11:00:05 +02:00
projects Merge branch 'issue_20245' into 'master' 2016-11-14 10:05:30 +00:00
protected_branches Move protected branches access control spec into a shared example. 2016-08-20 00:24:12 +05:30
security Add missing security specs for raw snippet access 2016-11-05 07:11:50 +00:00
snippets Move spinach public snippet feature to rspec spec 2016-11-04 06:58:40 +00:00
tags
…
todos Issue #13823: random message when all Todos are Done 2016-11-11 20:59:54 +01:00
users Fix snippets pagination 2016-09-26 12:42:12 +02:00
calendar_spec.rb Changed zero padded days to no padded days in date_format 2016-10-01 12:18:44 -05:00
ci_lint_spec.rb fixes part1 of files to start using active tense 2016-08-09 15:06:23 +01:00
commits_spec.rb Merge remote-tracking branch 'upstream/master' into show-status-from-branch 2016-11-04 22:37:44 +08:00
compare_spec.rb Fix broken rspec in compare text 2016-10-16 21:09:38 -07:00
container_registry_spec.rb
…
dashboard_issues_spec.rb Issues atom feed url reflect filters on dashboard 2016-11-03 18:26:06 +01:00
dashboard_milestones_spec.rb
…
environments_spec.rb Merge two scenarios into one 2016-10-18 16:46:19 +02:00
expand_collapse_diffs_spec.rb Fix expanding a collapsed diff when converting a symlink to a regular file 2016-11-10 18:24:12 +01:00
gitlab_flavored_markdown_spec.rb fixes part1 of files to start using active tense 2016-08-09 15:06:23 +01:00
global_search_spec.rb Fix broken commits search 2016-11-08 12:03:23 +02:00
groups_spec.rb 19205 Redesign group page header to match new navigation 2016-11-09 17:24:17 -08:00
help_pages_spec.rb fixes part1 of files to start using active tense 2016-08-09 15:06:23 +01:00
issues_spec.rb implements reset incoming email token on issues modal and account page, 2016-11-07 15:56:18 +00:00
login_spec.rb Fix rubocop build error 2016-10-24 21:44:24 -04:00
markdown_spec.rb
…
milestone_spec.rb Ensure validation messages are shown within the milestone form 2016-09-19 09:29:12 +01:00
notes_on_merge_requests_spec.rb Adds v-pre to code blocks in comments 2016-10-04 14:06:44 +01:00
participants_autocomplete_spec.rb fixes part1 of files to start using active tense 2016-08-09 15:06:23 +01:00
password_reset_spec.rb
…
profile_spec.rb implements reset incoming email token on issues modal and account page, 2016-11-07 15:56:18 +00:00
projects_spec.rb Allow Member.add_user to handle access requesters 2016-09-28 09:43:00 +02:00
protected_branches_spec.rb Move protected branches access control spec into a shared example. 2016-08-20 00:24:12 +05:30
runners_spec.rb Fix grammar and typos in Runners pages 2016-09-28 10:03:59 +02:00
search_spec.rb Fix broken commits search 2016-11-08 12:03:23 +02:00
signup_spec.rb Make UX upgrades to SignIn/Register views. 2016-10-15 08:27:21 +02:00
snippets_spec.rb Fix snippets pagination 2016-09-26 12:42:12 +02:00
task_lists_spec.rb Shorten task status phrase 2016-08-29 10:46:36 -05:00
triggers_spec.rb Fix failing rspec test for triggers 2016-09-06 11:52:01 +02:00
u2f_spec.rb Make UX upgrades to SignIn/Register views. 2016-10-15 08:27:21 +02:00
unsubscribe_links_spec.rb Wrap List-Unsubscribe link in angle brackets 2016-09-26 16:01:17 +01:00
users_spec.rb Merge branch 'dz-rename-user-routes' into 'master' 2016-10-17 20:47:46 +02:00
variables_spec.rb Updated tests 2016-08-13 00:57:40 -05:00