Move script tag content in widget views into ci_bundle.

app/assets/javascripts/merge_request_widget/ci_bundle.js.es6

@@ -5,20 +5,35 @@ $(() => {
    * temporarily.
    * */
 
-  $('.accept-mr-form').on('ajax:send', () => {
-    $('.accept-mr-form :input').disable();
-  });
+  if ($('.accept-mr-form').length) {
+    $('.accept-mr-form').on('ajax:send', () => {
+      $('.accept-mr-form :input').disable();
+    });
 
-  $('.accept_merge_request').on('click', () => {
-    $('.js-merge-button').html('<i class="fa fa-spinner fa-spin"></i> Merge in progress');
-  });
+    $('.accept_merge_request').on('click', () => {
+      $('.js-merge-button').html('<i class="fa fa-spinner fa-spin"></i> Merge in progress');
+    });
 
-  $('.merge_when_build_succeeds').on('click', () => {
-    $('#merge_when_build_succeeds').val('1');
-  });
+    $('.merge_when_build_succeeds').on('click', () => {
+      $('#merge_when_build_succeeds').val('1');
+    });
 
-  $('.js-merge-dropdown a').on('click', (e) => {
-    e.preventDefault();
-    $(this).closest('form').submit();
-  });
+    $('.js-merge-dropdown a').on('click', (e) => {
+      e.preventDefault();
+      $(this).closest('form').submit();
+    });
+
+  } else if ($('.rebase-in-progress').length) {
+      merge_request_widget.rebaseInProgress();
+  } else if ($('.rebase-mr-form').length) {
+    $('.rebase-mr-form').on('ajax:send', function() {
+      $('.rebase-mr-form :input').disable();
+    });
+
+    $('.js-rebase-button').on('click', function() {
+      $('.js-rebase-button').html("<i class='fa fa-spinner fa-spin'></i> Rebase in progress");
+    });
+  } else {
+    merge_request_widget.getMergeStatus();
+  }
 });

app/views/projects/merge_requests/widget/open/_check.html.haml

+- 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();
-  });
-

app/views/projects/merge_requests/widget/open/_rebase.html.haml

+- content_for :page_specific_javascripts do
+  = page_specific_javascript_tag('merge_request_widget/ci_bundle.js')
+
 - if @merge_request.rebase_in_progress? || (defined?(rebase_in_progress) && rebase_in_progress)
-  %h4
+  %h4.rebase-in-progress
     = icon("spinner spin")
     Rebase in progress…
   %p
     This merge request is in the process of being rebased.
 
-  :javascript
-    $(function() {
-      merge_request_widget.rebaseInProgress()
-    });
 - elsif !can_push_branch?(@merge_request.source_project, @merge_request.source_branch)
   %h4
     = icon("exclamation-triangle")
@@ -26,12 +25,3 @@
           Rebase onto #{@merge_request.target_branch}
       .accept-control
         Fast-forward merge is not possible. Rebase the source branch onto the target branch or merge target branch into source branch to allow this merge request to be merged.
-
-  :javascript
-    $('.rebase-mr-form').on('ajax:send', function() {
-      $('.rebase-mr-form :input').disable();
-    });
-
-    $('.js-rebase-button').on('click', function() {
-      $('.js-rebase-button').html("<i class='fa fa-spinner fa-spin'></i> Rebase in progress");
-    });