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/views/projects | |
| 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/views/projects')
| -rw-r--r-- | app/views/projects/diffs/_content.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/projects/diffs/_content.html.haml b/app/views/projects/diffs/_content.html.haml index 779c8ea0104..c3d2f80544b 100644 --- a/app/views/projects/diffs/_content.html.haml +++ b/app/views/projects/diffs/_content.html.haml @@ -9,7 +9,7 @@ - if !project.repository.diffable?(blob) .nothing-here-block This diff was suppressed by a .gitattributes entry. - elsif diff_file.collapsed? - - url = url_for(params.merge(action: :diff_for_path, old_path: diff_file.old_path, new_path: diff_file.new_path)) + - url = url_for(params.merge(action: :diff_for_path, old_path: diff_file.old_path, new_path: diff_file.new_path, file_identifier: diff_file.file_identifier)) .nothing-here-block.diff-collapsed{data: { diff_for_path: url } } This diff is collapsed. %a.click-to-expand |