summaryrefslogtreecommitdiff
path: root/lib/gitlab/diff/file_collection/merge_request_diff.rb
Commit message (Collapse)AuthorAgeFilesLines
* Fix expanding a collapsed diff when converting a symlink to a regular fileadam-fix-collapsed-diff-symlink-file-conversionAdam Niedzielski2016-11-101-1/+1
| | | | | In this case comparing old_path and new_path is not enough because there are two entires that match.
* Fix the diff in the merge request view when converting a symlink to a ↵adam-fix-mr-diff-symlink-file-conversionAdam Niedzielski2016-10-171-5/+5
| | | | | | | | regular file. In this specific case using file_path as a cache key is not enough, because there are two entries with the same path. Closes #21610.
* Make merge request diff works with new FileCollection logicDmitriy Zaporozhets2016-08-151-0/+73
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>