diff options
| author | Phil Hughes <me@iamphill.com> | 2016-07-26 14:30:57 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2016-07-26 14:30:57 +0100 |
| commit | 5e8606562df861e22d80e888457300f862aeb89b (patch) | |
| tree | aa7789b6464ea876717f16846070869d1caa5d59 /app/views/projects | |
| parent | 6537a4a8feac08031b3be2133f6756afb3310254 (diff) | |
| download | gitlab-ce-5e8606562df861e22d80e888457300f862aeb89b.tar.gz | |
Added ability to toggle resolving by commenting
Diffstat (limited to 'app/views/projects')
| -rw-r--r-- | app/views/projects/merge_requests/_discussion.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/notes/_form.html.haml | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/app/views/projects/merge_requests/_discussion.html.haml b/app/views/projects/merge_requests/_discussion.html.haml index 768d4673680..35c787ca780 100644 --- a/app/views/projects/merge_requests/_discussion.html.haml +++ b/app/views/projects/merge_requests/_discussion.html.haml @@ -4,6 +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 discussion', 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}" } + = submit_tag 'Comment & resolve discussion', class: "btn btn-nr btn-create append-right-10 comment-btn js-comment-resolve-button", data: { namespace_path: "#{@merge_request.project.namespace.path}", project_path: "#{@merge_request.project.path}" } #notes= render "projects/notes/notes_with_form" diff --git a/app/views/projects/notes/_form.html.haml b/app/views/projects/notes/_form.html.haml index 7c61ba750fe..a9f2cd873fe 100644 --- a/app/views/projects/notes/_form.html.haml +++ b/app/views/projects/notes/_form.html.haml @@ -5,6 +5,7 @@ = f.hidden_field :commit_id = f.hidden_field :line_code = f.hidden_field :noteable_id + = hidden_field_tag :noteable_iid, @note.noteable.iid = f.hidden_field :noteable_type = f.hidden_field :type = f.hidden_field :position |