diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2016-11-11 11:19:50 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2016-11-11 11:19:50 +0000 |
| commit | 0c7c0edfe28f12607090183eebf46ad8abacd0bf (patch) | |
| tree | 34209fd11e075fe06380ee5d9a96904e9874612e /app/controllers | |
| parent | a5c3bfc94de82a4ac82f1fce006601426e8684d9 (diff) | |
| parent | 3fa265d19547669c60788e38e389fa12bb119235 (diff) | |
| download | gitlab-ce-0c7c0edfe28f12607090183eebf46ad8abacd0bf.tar.gz | |
Merge branch 'adam-fix-collapsed-diff-symlink-file-conversion' into 'master'
Fix the collapsed diff when converting a symlink to a regular file
#21610
!6828
See merge request !6953
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/concerns/diff_for_path.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/concerns/diff_for_path.rb b/app/controllers/concerns/diff_for_path.rb index aeec3009f15..1efa9fe060f 100644 --- a/app/controllers/concerns/diff_for_path.rb +++ b/app/controllers/concerns/diff_for_path.rb @@ -3,7 +3,7 @@ module DiffForPath def render_diff_for_path(diffs) diff_file = diffs.diff_files.find do |diff| - diff.old_path == params[:old_path] && diff.new_path == params[:new_path] + diff.file_identifier == params[:file_identifier] end return render_404 unless diff_file |