diff options
| author | Tim Zallmann <tzallmann@gitlab.com> | 2017-08-16 12:31:47 +0000 |
|---|---|---|
| committer | Tim Zallmann <tzallmann@gitlab.com> | 2017-08-16 12:31:47 +0000 |
| commit | ee4528526e1bbf58f256c0fcc27873fcdf80daa4 (patch) | |
| tree | af07e1f0d30477c6b1ed5dab5bf411b417db2d49 /app/views/projects/merge_requests | |
| parent | 1998a4a10796a277b3e587e61a8299ce981c92d2 (diff) | |
| parent | 554afea059446384783f3c68c09ac56afa0e7d49 (diff) | |
| download | gitlab-ce-ee4528526e1bbf58f256c0fcc27873fcdf80daa4.tar.gz | |
Merge branch 'dispatcher-race-condition-fix' into 'master'
Fix race condition with dispatcher.js
See merge request !13377
Diffstat (limited to 'app/views/projects/merge_requests')
| -rw-r--r-- | app/views/projects/merge_requests/_discussion.html.haml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/views/projects/merge_requests/_discussion.html.haml b/app/views/projects/merge_requests/_discussion.html.haml index b787edb3427..3303aa72604 100644 --- a/app/views/projects/merge_requests/_discussion.html.haml +++ b/app/views/projects/merge_requests/_discussion.html.haml @@ -4,8 +4,8 @@ = 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.reopenable? = 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-close 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{ "v-if" => "showButton", type: "submit", data: { project_path: "#{project_path(@merge_request.project)}" } } - {{ buttonText }} + %comment-and-resolve-btn{ "inline-template" => true } + %button.btn.btn-nr.btn-default.append-right-10.js-comment-resolve-button{ "v-if" => "showButton", type: "submit", data: { project_path: "#{project_path(@merge_request.project)}" } } + {{ buttonText }} #notes= render "shared/notes/notes_with_form", :autocomplete => true |