gitlab-org--gitlab-foss/spec/lib/gitlab/diff
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
..
file_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
highlight_spec.rb switch from diff_file_collection to diffs 2016-08-03 07:00:20 +02:00
inline_diff_marker_spec.rb Enable Style/EmptyLines cop, remove redundant ones 2016-07-01 21:56:17 +02:00
inline_diff_spec.rb Render inline diffs for multiple changed lines following eachother 2016-07-11 18:58:15 -05:00
line_mapper_spec.rb switch from diff_file_collection to diffs 2016-08-03 07:00:20 +02:00
parallel_diff_spec.rb switch from diff_file_collection to diffs 2016-08-03 07:00:20 +02:00
parser_spec.rb switch from diff_file_collection to diffs 2016-08-03 07:00:20 +02:00
position_spec.rb Fix line commenting for the initial commit 2016-08-19 16:35:44 +01:00
position_tracer_spec.rb Revert "Revert "Merge branch '18193-developers-can-merge' into 'master' "" 2016-07-18 10:16:56 +02:00