diff options
| author | Douwe Maan <douwe@selenight.nl> | 2017-03-10 04:29:11 +0300 |
|---|---|---|
| committer | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-04-05 19:44:14 +0300 |
| commit | 08bbb9fce66cb46d3262e6cd4c4379b59f065be0 (patch) | |
| tree | 159eeb7ca43419f29926d6e77637db18bddd20a9 /app/views/discussions/_notes.html.haml | |
| parent | 8bdfee8ba5fb0a8f48501e63274c8f9ce5708007 (diff) | |
Add option to start a new discussion on an MR
Diffstat (limited to 'app/views/discussions/_notes.html.haml')
| -rw-r--r-- | app/views/discussions/_notes.html.haml | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/app/views/discussions/_notes.html.haml b/app/views/discussions/_notes.html.haml index 2789391819c..c8fcc37d1ab 100644 --- a/app/views/discussions/_notes.html.haml +++ b/app/views/discussions/_notes.html.haml @@ -1,18 +1,19 @@ -%ul.notes{ data: { discussion_id: discussion.id } } +%ul.notes{ data: { discussion_id: discussion.id, original_discussion_id: discussion.original_id } } = render partial: "projects/notes/note", collection: discussion.notes, as: :note - if current_user .discussion-reply-holder - - if discussion.diff_discussion? + - if discussion.potentially_resolvable? - line_type = local_assigns.fetch(:line_type, nil) .btn-group-justified.discussion-with-resolve-btn{ role: "group" } .btn-group{ role: "group" } = link_to_reply_discussion(discussion, line_type) + = render "discussions/resolve_all", discussion: discussion - - if discussion.for_merge_request? - .btn-group.discussion-actions - = render "discussions/new_issue_for_discussion", discussion: discussion, merge_request: discussion.noteable - = render "discussions/jump_to_next", discussion: discussion + + .btn-group.discussion-actions + = render "discussions/new_issue_for_discussion", discussion: discussion, merge_request: discussion.noteable + = render "discussions/jump_to_next", discussion: discussion - else = link_to_reply_discussion(discussion) |