diff options
| author | Yar <YarTheGreat@gmail.com> | 2016-11-13 21:18:03 +0300 |
|---|---|---|
| committer | YarNayar <YarTheGreat@gmail.com> | 2016-11-15 20:51:21 +0300 |
| commit | 8782bb96cca3ade2b367f588fd8332906dcc2d1b (patch) | |
| tree | 9f46f21807532db46d72cd5f4936d088368f5fd7 /app/views/projects/diffs/_stats.html.haml | |
| parent | 5b876592b47209e431d37b281aacb187df870ea3 (diff) | |
Unify anchor link format for MR diff files !7298
Right now, the following naming scheme for diff files is used: diff-1, diff-2, ... and also we have "internal" format which is file-path-HASH, where HASH is sha1 of file path.
Besides, we have HASH_lineA_lineB format to link exact line number in MR diff. It makes sence to unify the way we link diff from outside, while leave "file-path-HASH" format for internal (js) usage.
Changes in this commit allow to link diff just by HASH, if we don't want specify exact lines, also it changes "file-path-HASH" and "diff-NUMBER" links in code to this unified format.
Inspired by #24010 and !7298
Diffstat (limited to 'app/views/projects/diffs/_stats.html.haml')
| -rw-r--r-- | app/views/projects/diffs/_stats.html.haml | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/app/views/projects/diffs/_stats.html.haml b/app/views/projects/diffs/_stats.html.haml index e751dabdf99..66d6254aa1e 100644 --- a/app/views/projects/diffs/_stats.html.haml +++ b/app/views/projects/diffs/_stats.html.haml @@ -9,28 +9,29 @@ %strong.cred #{diff_files.sum(&:removed_lines)} deletions .file-stats.js-toggle-content.hide %ul - - diff_files.each_with_index do |diff_file, i| + - diff_files.each do |diff_file| + - file_hash = hexdigest(diff_file.file_path) %li - if diff_file.deleted_file %span.deleted-file - %a{href: "#diff-#{i}"} + %a{href: "##{file_hash}"} %i.fa.fa-minus = diff_file.old_path - elsif diff_file.renamed_file %span.renamed-file - %a{href: "#diff-#{i}"} + %a{href: "##{file_hash}"} %i.fa.fa-minus = diff_file.old_path → = diff_file.new_path - elsif diff_file.new_file %span.new-file - %a{href: "#diff-#{i}"} + %a{href: "##{file_hash}"} %i.fa.fa-plus = diff_file.new_path - else %span.edit-file - %a{href: "#diff-#{i}"} + %a{href: "##{file_hash}"} %i.fa.fa-adjust = diff_file.new_path |