diff options
| author | Felipe Artur <fcardozo@gitlab.com> | 2017-10-07 07:25:17 +0300 |
|---|---|---|
| committer | Jacob Schatz <jschatz@gitlab.com> | 2017-10-07 07:25:17 +0300 |
| commit | b54203f0ada8f7ad6d24437b6f5f46ebf43f8695 (patch) | |
| tree | b903596b4755da406dfd1349a8b2c59a5f38b9d1 /app/views/discussions/_diff_discussion.html.haml | |
| parent | b4f9dc48163c065d776d120dd312c689ce79f653 (diff) | |
Commenting on image diffs
Diffstat (limited to 'app/views/discussions/_diff_discussion.html.haml')
| -rw-r--r-- | app/views/discussions/_diff_discussion.html.haml | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/app/views/discussions/_diff_discussion.html.haml b/app/views/discussions/_diff_discussion.html.haml index e6d307e5568..52279d0a870 100644 --- a/app/views/discussions/_diff_discussion.html.haml +++ b/app/views/discussions/_diff_discussion.html.haml @@ -1,6 +1,10 @@ -- expanded = local_assigns.fetch(:expanded, true) -%tr.notes_holder{ class: ('hide' unless expanded) } - %td.notes_line{ colspan: 2 } - %td.notes_content - .content{ class: ('hide' unless expanded) } - = render partial: "discussions/notes", collection: discussions, as: :discussion +- if local_assigns[:on_image] + = render partial: "discussions/notes", collection: discussions, as: :discussion +- else + -# Text diff discussions + - expanded = local_assigns.fetch(:expanded, true) + %tr.notes_holder{ class: ('hide' unless expanded) } + %td.notes_line{ colspan: 2 } + %td.notes_content + .content{ class: ('hide' unless expanded) } + = render partial: "discussions/notes", collection: discussions, as: :discussion |