diff options
| author | Sean McGivern <sean@gitlab.com> | 2016-07-08 22:50:06 +0100 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2016-07-11 09:31:34 +0100 |
| commit | 5266ae87c43a6760600e397257f9791d950dbe15 (patch) | |
| tree | 83e840670b4c772020be590e5934586fe746df6e /app/views | |
| parent | e462e122784f40550c53224af5a58b201ed1fd8f (diff) | |
| download | gitlab-ce-5266ae87c43a6760600e397257f9791d950dbe15.tar.gz | |
Support renames in diff_for_path actions
Diffstat (limited to 'app/views')
| -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 bfcd3ee9132..0c0424edffd 100644 --- a/app/views/projects/diffs/_content.html.haml +++ b/app/views/projects/diffs/_content.html.haml @@ -10,7 +10,7 @@ .nothing-here-block This diff was suppressed by a .gitattributes entry. - elsif diff_file.diff_lines.length > 0 - if diff_file.collapsed_by_default? && !expand_all_diffs? - - url = url_for(params.merge(action: :diff_for_path, path: diff_file.file_path, format: nil)) + - url = url_for(params.merge(action: :diff_for_path, old_path: diff_file.old_path, new_path: diff_file.new_path)) .nothing-here-block.diff-collapsed{data: { diff_for_path: url } } This diff is collapsed. Click to expand it. - elsif diff_view == 'parallel' |