gitlab-org--gitlab-foss/spec/features/merge_requests
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
..
assign_issues_spec.rb Added link to bulk assign issues to MR author. (Issue #18876) 2016-10-06 13:37:37 +01:00
award_spec.rb
check_if_mergeable_with_unresolved_discussions.rb Complete and improve specs 2016-11-04 14:58:40 +01:00
cherry_pick_spec.rb
conflicts_spec.rb Add more tests to check conflicts resolution 2016-10-13 14:16:35 -05:00
create_new_mr_spec.rb 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
created_from_fork_spec.rb Remove use of wait_for_ajax since jQuery was removed 2016-10-25 17:04:58 -07:00
diff_notes_resolve_spec.rb Fixed tests for issue boards & diff note resolving 2016-11-10 17:53:34 +03:00
diff_notes_spec.rb Fix diff comments on legacy MRs 2016-08-30 09:19:57 +01:00
diffs_spec.rb
edit_mr_spec.rb Ensure merge request's "remove branch" accessors return booleans 2016-11-03 18:29:00 +01:00
filter_by_milestone_spec.rb Escape quotes in gl_dropdown values to prevent exceptions 2016-10-26 12:09:04 +01:00
form_spec.rb
merge_request_versions_spec.rb Remove duplicate test 2016-10-01 03:33:20 -04:00
merge_when_build_succeeds_spec.rb Fix specs 2016-10-17 22:01:56 +02:00
only_allow_merge_if_build_succeeds.rb
pipelines_spec.rb
toggle_whitespace_changes.rb
update_merge_requests_spec.rb Refactor code for bulk update merge requests feature 2016-09-08 15:33:53 +03:00
user_lists_merge_requests_spec.rb
user_uses_slash_commands_spec.rb Back off the array spreading, bc poltergeist freaks out. 2016-10-15 08:28:55 +02:00
widget_deployments_spec.rb Fix remaining offenses 2016-10-18 13:51:12 +02:00