diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2018-04-18 15:28:02 +0000 |
|---|---|---|
| committer | Clement Ho <clemmakesapps@gmail.com> | 2018-04-18 15:28:02 +0000 |
| commit | cad4eb989e87c2e1ce996cfb5817d2c1729111c8 (patch) | |
| tree | c22d766e5f9dd8a299a3d68cd70f8a04df7e754a /app/views/projects/diffs | |
| parent | 02579d6aeba3673c950896bdb511df8c678e20ca (diff) | |
| parent | d8dd75ca775f66fd756e43ddd73ac75d39fc3e64 (diff) | |
| download | gitlab-ce-cad4eb989e87c2e1ce996cfb5817d2c1729111c8.tar.gz | |
Merge branch 'master' into 'bootstrap4'
# Conflicts:
# app/views/projects/issues/_nav_btns.html.haml
# app/views/projects/merge_requests/creations/_new_compare.html.haml
Diffstat (limited to 'app/views/projects/diffs')
| -rw-r--r-- | app/views/projects/diffs/_collapsed.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/projects/diffs/_collapsed.html.haml b/app/views/projects/diffs/_collapsed.html.haml index 8772bd4705f..5762f4d86d7 100644 --- a/app/views/projects/diffs/_collapsed.html.haml +++ b/app/views/projects/diffs/_collapsed.html.haml @@ -1,5 +1,5 @@ - diff_file = viewer.diff_file -- 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)) +- url = url_for(safe_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 Click to expand it. |