3 commits

Author	SHA1	Message	Date
Adam Niedzielski	3fa265d195	Fix expanding a collapsed diff when converting a symlink to a regular file ... In this case comparing old_path and new_path is not enough because there are two entires that match.	2016-11-10 18:24:12 +01:00
Adam Niedzielski	317e48193f	Fix the diff in the merge request view when converting a symlink to a 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.	2016-10-17 18:09:34 +02:00
Dmitriy Zaporozhets	643a368fa4	Make merge request diff works with new FileCollection logic ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2016-08-15 17:57:19 +03:00

Renamed from lib/gitlab/diff/file_collection/merge_request.rb (Browse further)