diff options
| author | Jacob Carlborg <jacob.carlborg@tretti.se> | 2014-01-09 17:50:27 +0100 |
|---|---|---|
| committer | Jacob Carlborg <doob@me.com> | 2014-02-22 21:21:12 +0100 |
| commit | 2d554f42f07a9bebcb6d43ace2cdeedcc54e8de9 (patch) | |
| tree | 146bda9f4c39dcefe9b18b31b2256c6c66186c36 /app/views/projects/notes | |
| parent | 138e2a50b7d839bd37c21b2849df422f9dfef6bb (diff) | |
| download | gitlab-ce-2d554f42f07a9bebcb6d43ace2cdeedcc54e8de9.tar.gz | |
Add button for toggling inline comments in diff view.
This is useful when there are many comments and they're becoming a distraction when trying to read the diff.
Diffstat (limited to 'app/views/projects/notes')
| -rw-r--r-- | app/views/projects/notes/_diff_notes_with_reply.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/notes/_diff_notes_with_reply_parallel.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/projects/notes/_diff_notes_with_reply.html.haml b/app/views/projects/notes/_diff_notes_with_reply.html.haml index 9537ab18caa..9acadc6a14e 100644 --- a/app/views/projects/notes/_diff_notes_with_reply.html.haml +++ b/app/views/projects/notes/_diff_notes_with_reply.html.haml @@ -1,7 +1,7 @@ - note = notes.first # example note -# Check if line want not changed since comment was left - if !defined?(line) || line == note.diff_line - %tr.notes_holder + %tr.notes_holder.js-toggle-content %td.notes_line{ colspan: 2 } %span.btn.disabled %i.icon-comment diff --git a/app/views/projects/notes/_diff_notes_with_reply_parallel.html.haml b/app/views/projects/notes/_diff_notes_with_reply_parallel.html.haml index 936dbb354cd..2012aa021b9 100644 --- a/app/views/projects/notes/_diff_notes_with_reply_parallel.html.haml +++ b/app/views/projects/notes/_diff_notes_with_reply_parallel.html.haml @@ -1,6 +1,6 @@ - note1 = notes1.first # example note - note2 = notes2.first # example note -%tr.notes_holder +%tr.notes_holder.js-toggle-content -# Check if line want not changed since comment was left /- if !defined?(line1) || line1 == note1.diff_line - if note1 |