Merge branch 'improve-merge-widget' into 'master'

app/assets/stylesheets/sections/merge_requests.scss

@@ -11,10 +11,27 @@
     }
   }
 
-  .accept-group {
-    label {
-      margin: 5px;
+  .accept-merge-holder {
+    margin-top: 5px;
+
+    .accept-action {
+      display: inline-block;
+
+      .accept_merge_request {
+        padding: 10px 20px;
+      }
+    }
+
+    .accept-control {
+      display: inline-block;
       margin-left: 20px;
+      padding: 10px 0;
+      line-height: 20px;
+      font-weight: bold;
+
+      .checkbox {
+        margin: 0;
+      }
     }
   }
 }

app/views/projects/merge_requests/show/_mr_accept.html.haml

@@ -13,25 +13,22 @@
   .automerge_widget.can_be_merged.hide
     .clearfix
       = form_for [:automerge, @project, @merge_request], remote: true, method: :post do |f|
-        %h4
-          You can accept this request automatically.
-        .accept-merge-holder.clearfix
-          .accept-group
-            .pull-left
-              = f.submit "Accept Merge Request", class: "btn btn-create accept_merge_request"
-            - if can_remove_branch?(@merge_request.source_project, @merge_request.source_branch) && !@merge_request.for_fork?
-              .remove_branch_holder.pull-left
-                = label_tag :should_remove_source_branch, class: "checkbox" do
-                  = check_box_tag :should_remove_source_branch
-                  Remove source-branch
-            .js-toggle-container
-              %label
-                %i.fa.fa-edit
-                = link_to "modify merge commit message", "#", class: "modify-merge-commit-link js-toggle-button", title: "Modify merge commit message"
-              .js-toggle-content.hide
-                = render 'shared/commit_message_container', params: params,
-                    text: @merge_request.merge_commit_message,
-                    rows: 14, hint: true
+        .accept-merge-holder.clearfix.js-toggle-container
+          .accept-action
+            = f.submit "Accept Merge Request", class: "btn btn-create accept_merge_request"
+          - if can_remove_branch?(@merge_request.source_project, @merge_request.source_branch) && !@merge_request.for_fork?
+            .accept-control
+              = label_tag :should_remove_source_branch, class: "checkbox" do
+                = check_box_tag :should_remove_source_branch
+                Remove source-branch
+          .accept-control
+            = link_to "#", class: "modify-merge-commit-link js-toggle-button", title: "Modify merge commit message" do
+              %i.fa.fa-edit
+              Modify commit message
+          .js-toggle-content.hide.prepend-top-20
+            = render 'shared/commit_message_container', params: params,
+                text: @merge_request.merge_commit_message,
+                rows: 14, hint: true
 
         %hr
         .light

features/steps/project/merge_requests.rb

@@ -156,7 +156,7 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
   end
 
   step 'merge request is mergeable' do
-    page.should have_content 'You can accept this request automatically'
+    page.should have_button 'Accept Merge Request'
   end
 
   step 'I modify merge commit message' do