From e7626eb0e5a37a6da7c937d3f76d3fcd6b72d92c Mon Sep 17 00:00:00 2001 From: Phil Hughes Date: Fri, 15 Jul 2016 15:32:56 +0100 Subject: Added comment & resolve button to reply form --- app/views/projects/merge_requests/_discussion.html.haml | 1 + 1 file changed, 1 insertion(+) (limited to 'app/views/projects/merge_requests/_discussion.html.haml') diff --git a/app/views/projects/merge_requests/_discussion.html.haml b/app/views/projects/merge_requests/_discussion.html.haml index 53dd300c35c..d9da553159d 100644 --- a/app/views/projects/merge_requests/_discussion.html.haml +++ b/app/views/projects/merge_requests/_discussion.html.haml @@ -4,5 +4,6 @@ = link_to 'Close merge request', merge_request_path(@merge_request, merge_request: {state_event: :close }), method: :put, class: "btn btn-nr btn-comment btn-close close-mr-link js-note-target-close", title: "Close merge request", data: {original_text: "Close merge request", alternative_text: "Comment & close merge request"} - if @merge_request.closed? = link_to 'Reopen merge request', merge_request_path(@merge_request, merge_request: {state_event: :reopen }), method: :put, class: "btn btn-nr btn-comment btn-reopen reopen-mr-link js-note-target-reopen", title: "Reopen merge request", data: {original_text: "Reopen merge request", alternative_text: "Comment & reopen merge request"} + = submit_tag 'Comment & resolve all', class: "btn btn-nr btn-create append-right-10 comment-btn js-comment-resolve-button", data: { namespace: "#{@merge_request.project.namespace.path}/#{@merge_request.project.path}" } #notes= render "projects/notes/notes_with_form" -- cgit v1.2.1