Merge branch 'mr-accept-widget' into 'master'

Improve MR accept widget

* fixes UX problem with 2 confusing `click here` links.
* separate Accept MR block from manual merge instructions

See merge request !1014

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

@@ -15,17 +15,12 @@
       = form_for [:automerge, @project, @merge_request], remote: true, method: :post do |f|
         %h4
           You can accept this request automatically.
-        %div
-          If you still want to do it manually -
-          %strong
-            = link_to "click here", "#modal_merge_info", class: "how_to_merge_link vlink", title: "How To Merge", "data-toggle" => "modal"
-          for instructions.
-
+        .accept-merge-holder.clearfix
           .js-toggle-container
             %p
-            If you want to modify merge commit message -
-            %strong
-              = link_to "click here", "#", class: "modify-merge-commit-link js-toggle-button", title: "Modify merge commit message"
+              You can
+              %strong= link_to "modify merge commit message", "#", class: "modify-merge-commit-link js-toggle-button", title: "Modify merge commit message"
+              before accepting merge request
             .js-toggle-content.hide
               .form-group
                 = label_tag :merge_commit_message, "Commit message", class: 'control-label'
@@ -44,6 +39,12 @@
                   = check_box_tag :should_remove_source_branch
                   Remove source-branch
 
+        %hr
+        .light
+          If you still want to merge this request manually - use
+          %strong
+            = link_to "command line", "#modal_merge_info", class: "how_to_merge_link vlink", title: "How To Merge", "data-toggle" => "modal"
+
 
   .automerge_widget.no_satellite.hide
     %p