diff options
author | Phil Hughes <me@iamphill.com> | 2016-08-04 09:52:17 +0100 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2016-08-04 09:52:17 +0100 |
commit | 433f1c42c3958381a6af539e9a9ab206c749d9f4 (patch) | |
tree | d7cbefc34a9f7feed30786a068b4eb242104a70a /app/views/projects | |
parent | 538e66d71c0f7125cc62ea51480668ba8b342544 (diff) | |
download | gitlab-ce-433f1c42c3958381a6af539e9a9ab206c749d9f4.tar.gz |
Comment & resolve button no longer looks for can-resolve attribute
Fixed some bugs when removing notes
Diffstat (limited to 'app/views/projects')
-rw-r--r-- | app/views/projects/merge_requests/_discussion.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/projects/merge_requests/_discussion.html.haml b/app/views/projects/merge_requests/_discussion.html.haml index 218dbbb7951..d070979bcfe 100644 --- a/app/views/projects/merge_requests/_discussion.html.haml +++ b/app/views/projects/merge_requests/_discussion.html.haml @@ -5,7 +5,7 @@ - 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"} %comment-and-resolve-btn{ "inline-template" => true, ":discussion-id" => "" } - %button.btn.btn-nr.btn-default.append-right-10.js-comment-resolve-button{ type: "submit", data: { namespace_path: "#{@merge_request.project.namespace.path}", project_path: "#{@merge_request.project.path}" } } + %button.btn.btn-nr.btn-default.append-right-10.js-comment-resolve-button{ "v-if" => "showButton", type: "submit", data: { namespace_path: "#{@merge_request.project.namespace.path}", project_path: "#{@merge_request.project.path}" } } {{ buttonText }} #notes= render "projects/notes/notes_with_form" |