diff options
| author | Bryce Johnson <bryce@gitlab.com> | 2016-12-21 17:30:29 +0100 |
|---|---|---|
| committer | Bryce Johnson <bryce@gitlab.com> | 2016-12-21 17:30:29 +0100 |
| commit | d8740cfe19ea033a119cb4530aeb41fcec4bafca (patch) | |
| tree | 49bdcf669b2444bf0380273ee74a64d1e9f6c4a6 /app/views/projects/merge_requests/widget/open | |
| parent | 3bbe19d39bd7f2bebb1f68de99dfb791eaa7a928 (diff) | |
| download | gitlab-ce-d8740cfe19ea033a119cb4530aeb41fcec4bafca.tar.gz | |
Move javascript for widget check to ci_bundle.
Diffstat (limited to 'app/views/projects/merge_requests/widget/open')
| -rw-r--r-- | app/views/projects/merge_requests/widget/open/_check.html.haml | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/app/views/projects/merge_requests/widget/open/_check.html.haml b/app/views/projects/merge_requests/widget/open/_check.html.haml index e16878ba513..50086767446 100644 --- a/app/views/projects/merge_requests/widget/open/_check.html.haml +++ b/app/views/projects/merge_requests/widget/open/_check.html.haml @@ -1,9 +1,6 @@ +- content_for :page_specific_javascripts do + = page_specific_javascript_tag('merge_request_widget/ci_bundle.js') + %strong = icon("spinner spin") Checking ability to merge automatically… - -:javascript - $(function() { - merge_request_widget.getMergeStatus(); - }); - |