diff options
author | Bryce Johnson <bryce@gitlab.com> | 2016-12-20 17:41:09 +0100 |
---|---|---|
committer | Bryce Johnson <bryce@gitlab.com> | 2016-12-21 13:03:13 +0100 |
commit | 3bbe19d39bd7f2bebb1f68de99dfb791eaa7a928 (patch) | |
tree | fece150e534a224d5c454d8fa9ed4a1f0a97155c /app/views/projects/merge_requests/widget/open | |
parent | 0ba41ea1c8e9d99667401c2778c7c320b96c35e0 (diff) | |
download | gitlab-ce-3bbe19d39bd7f2bebb1f68de99dfb791eaa7a928.tar.gz |
Backport moving MR widget CI JS out of script tag.
Diffstat (limited to 'app/views/projects/merge_requests/widget/open')
-rw-r--r-- | app/views/projects/merge_requests/widget/open/_accept.html.haml | 21 |
1 files changed, 3 insertions, 18 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 d6f7f23533c..7809e9c8c72 100644 --- a/app/views/projects/merge_requests/widget/open/_accept.html.haml +++ b/app/views/projects/merge_requests/widget/open/_accept.html.haml @@ -1,3 +1,6 @@ +- content_for :page_specific_javascripts do + = page_specific_javascript_tag('merge_request_widget/ci_bundle.js') + - status_class = @pipeline ? " ci-#{@pipeline.status}" : nil = form_for [:merge, @project.namespace.becomes(Namespace), @project, @merge_request], remote: true, method: :post, html: { class: 'accept-mr-form js-quick-submit js-requires-input' } do |f| @@ -47,21 +50,3 @@ rows: 14, hint: true = hidden_field_tag :merge_when_build_succeeds, "", autocomplete: "off" - - :javascript - $('.accept-mr-form').on('ajax:send', function() { - $(".accept-mr-form :input").disable(); - }); - - $('.accept_merge_request').on('click', function() { - $('.js-merge-button').html("<i class='fa fa-spinner fa-spin'></i> Merge in progress"); - }); - - $('.merge_when_build_succeeds').on('click', function() { - $("#merge_when_build_succeeds").val("1"); - }); - - $('.js-merge-dropdown a').on('click', function(e) { - e.preventDefault(); - $(this).closest("form").submit(); - }); |