diff options
| author | Douwe Maan <douwe@selenight.nl> | 2016-07-28 19:14:00 -0600 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2016-07-28 19:28:56 -0600 |
| commit | 6d9715d8777265737c076abe06362d2a8e9e498d (patch) | |
| tree | ad55282043bd84bfbe8b4419568289b895e82d22 /app/views/discussions/_diff_discussion.html.haml | |
| parent | ce1843b7dea3b63cfced7800612098a766c68e13 (diff) | |
| download | gitlab-ce-6d9715d8777265737c076abe06362d2a8e9e498d.tar.gz | |
Show existing discussion when adding new comment on line with a hidden resolved discussion
Diffstat (limited to 'app/views/discussions/_diff_discussion.html.haml')
| -rw-r--r-- | app/views/discussions/_diff_discussion.html.haml | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/app/views/discussions/_diff_discussion.html.haml b/app/views/discussions/_diff_discussion.html.haml index 5f49d44b062..c280b5b53b7 100644 --- a/app/views/discussions/_diff_discussion.html.haml +++ b/app/views/discussions/_diff_discussion.html.haml @@ -1,13 +1,6 @@ -%tr.notes_holder +- expanded = local_assigns.fetch(:expanded, discussion.expanded?) +%tr.notes_holder{class: ('hide' unless expanded)} %td.notes_line{ colspan: 2 } %td.notes_content - %ul.notes{ data: { discussion_id: discussion.id } } - = render partial: "projects/notes/note", collection: discussion.notes, as: :note - - .discussion-reply-holder - .discussion-with-resolve-btn{ role: "group" } - .btn-group{ role: "group" } - = link_to_reply_discussion(discussion) - .btn-group{ role: "group" } - = render "discussions/resolve_all", discussion: discussion - = render "discussions/jump_to_next", discussion: discussion + .content + = render "discussions/notes", discussion: discussion |