Button fix

2 files changed, 30 insertions, 5 deletions

diff --git a/app/services/system_note_service.rb b/app/services/system_note_service.rb
index f84e480ca9c..6d15a49145d 100644
--- a/app/services/system_note_service.rb
+++ b/app/services/system_note_service.rb
@@ -139,7 +139,7 @@ class SystemNoteService
 
   # Called when 'merge when build succeeds' is canceled
   def self.cancel_merge_when_build_succeeds(noteable, project, author)
-    body = "Cancelled the automatic merge"
+    body = "Canceled the automatic merge"
 
     create_note(noteable: noteable, project: project, author: author, note: body)
   end
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 f7d872aa455..c2badf342db 100644
--- a/app/views/projects/merge_requests/widget/open/_accept.html.haml
+++ b/app/views/projects/merge_requests/widget/open/_accept.html.haml
@@ -5,10 +5,22 @@
   .accept-merge-holder.clearfix.js-toggle-container
     .accept-action
       - if @merge_request.ci_commit && @merge_request.ci_commit.active?
-        = f.button class: "btn btn-create btn-grouped merge_when_build_succeeds", name: "merge_when_build_succeeds" do
-          Merge When Build Succeeds
-        = f.button class: "btn btn-create btn-grouped accept_merge_request #{status_class}" do
-          Accept Merge Request Now
+        %span.btn-group
+          = link_to "#", class: "btn btn-create merge_when_build_succeeds" do
+            Merge When Build Succeeds
+          %a.btn.btn-success.dropdown-toggle{ 'data-toggle' => 'dropdown' }
+            %span.caret
+            %span.sr-only
+              Select Merge Moment
+          %ul.dropdown-menu.dropdown-menu-right{ role: 'menu' }
+            %li
+              = link_to "#", class: "merge_when_build_succeeds" do
+                = icon('check fw')
+                Merge When Build Succeeds
+            %li
+              = link_to "#", class: "accept_merge_request" do
+                = icon('warning fw')
+                Accept Merge Request Now
       - else
         = f.button class: "btn btn-create btn-grouped accept_merge_request #{status_class}" do
           Accept Merge Request
@@ -26,6 +38,8 @@
           text: @merge_request.merge_commit_message,
           rows: 14, hint: true
 
+    = hidden_field_tag :merge_when_build_succeeds, ""
+
   :javascript
     $('.accept_merge_request').on('click', function() {
       $(this).html("<i class='fa fa-spinner fa-spin'></i> Merge in progress");
@@ -34,3 +48,14 @@
     $('.accept-mr-form').on('ajax:send', function() {
       $(".accept-mr-form :input").disable();
     });
+
+    $('a.accept_merge_request').on('click', function(e) {
+      e.preventDefault();
+      $(this).closest("form").submit();
+    });
+
+    $('a.merge_when_build_succeeds').on('click', function(e) {
+      e.preventDefault();
+      $("#merge_when_build_succeeds").val("1");
+      $(this).closest("form").submit();
+    });