diff options
Diffstat (limited to 'app/views/projects/merge_requests/widget/open/_accept.html.haml')
| -rw-r--r-- | app/views/projects/merge_requests/widget/open/_accept.html.haml | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/app/views/projects/merge_requests/widget/open/_accept.html.haml b/app/views/projects/merge_requests/widget/open/_accept.html.haml index aa14b0cf21e..b2ea57126ee 100644 --- a/app/views/projects/merge_requests/widget/open/_accept.html.haml +++ b/app/views/projects/merge_requests/widget/open/_accept.html.haml @@ -1,4 +1,5 @@ = form_for [:automerge, @project.namespace.becomes(Namespace), @project, @merge_request], remote: true, method: :post do |f| + = hidden_field_tag :authenticity_token, form_authenticity_token .accept-merge-holder.clearfix.js-toggle-container .accept-action = f.submit "Accept Merge Request", class: "btn btn-create accept_merge_request" @@ -22,3 +23,8 @@ %strong = link_to "command line", "#modal_merge_info", class: "how_to_merge_link vlink", title: "How To Merge", "data-toggle" => "modal" + :coffeescript + disableButtonIfEmptyField '#commit_message', '.accept_merge_request' + + $('.accept_merge_request').on 'click', -> + $('.mr-widget-body').html("#{escape_javascript(render('projects/merge_requests/widget/open/mip'))}") |