diff options
| author | Bob Van Landuyt <bob@vanlanduyt.co> | 2017-02-27 12:23:36 +0300 |
|---|---|---|
| committer | Bob Van Landuyt <bob@gitlab.com> | 2017-03-13 10:27:51 +0300 |
| commit | f86928953d2d79f40f10813a6e244c1da0779d16 (patch) | |
| tree | 7396889bce42589175ec3c2fa314fdf621ef73b1 /app/views/discussions/_notes.html.haml | |
| parent | 51253b2dd0bb073d271ddcbd172f7c204d4639db (diff) | |
Always require MR-iid for resolving discussions
And deduplicate the finding of MR's & discussions. Now the searching
is done in the service, istead of the controller & the API.
Diffstat (limited to 'app/views/discussions/_notes.html.haml')
| -rw-r--r-- | app/views/discussions/_notes.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/discussions/_notes.html.haml b/app/views/discussions/_notes.html.haml index 4a1e93cec3a..2789391819c 100644 --- a/app/views/discussions/_notes.html.haml +++ b/app/views/discussions/_notes.html.haml @@ -12,7 +12,7 @@ = render "discussions/resolve_all", discussion: discussion - if discussion.for_merge_request? .btn-group.discussion-actions - = render "discussions/new_issue_for_discussion", discussion: discussion + = 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) |