gitlab-org--gitlab-foss/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_collection Fix expanding a collapsed diff when converting a symlink to a regular file 2016-11-10 18:24:12 +01:00
diff_refs.rb Add some more code comments. 2016-07-06 19:28:13 -04:00
file.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.rb Cache highlighted diff lines for merge requests 2016-08-03 07:00:19 +02:00
inline_diff.rb Fix method visibility in inline diff class 2016-07-19 15:12:14 +02:00
inline_diff_marker.rb Reuse existing SCSS variables 2016-05-18 13:20:46 -05:00
line.rb Fix specs 2016-08-12 23:24:46 +03:00
line_code.rb Refactoring inside refactoring. We need to go deeper 2014-09-08 21:54:52 +03:00
line_mapper.rb Add some more code comments. 2016-07-06 19:28:13 -04:00
parallel_diff.rb Add Discussion model to represent MR/diff discussion 2016-07-20 16:18:18 -06:00
parser.rb Enable Style/EmptyLines cop, remove redundant ones 2016-07-01 21:56:17 +02:00
position.rb Fix line commenting for the initial commit 2016-08-19 16:35:44 +01:00
position_tracer.rb Add Gitlab::Git::PositionTracer 2016-07-06 18:50:59 -04:00