Add "Merge manually..." option to MR accept widget

# Conflicts:
#	app/views/projects/merge_requests/_show.html.haml

CHANGELOG

@@ -25,12 +25,9 @@ v 7.14.0 (unreleased)
   - Return comments in created order in merge request API (Stan Hu)
   - Expire Rails cache entries after two weeks to prevent endless Redis growth
   - Add support for destroying project milestones (Stan Hu)
-  - Add fetch command to the MR page.
   - Allow custom backup archive permissions
-  - Add fetch command to the MR page
   - Add project star and fork count, group avatar URL and user/group web URL attributes to API
   - Fix bug causing Bitbucket importer to crash when OAuth application had been removed.
-  - Add fetch command to the MR page.
   - Show who last edited a comment if it wasn't the original author
   - Send notification to all participants when MR is merged.
   - Add ability to manage user email addresses via the API.
@@ -43,6 +40,10 @@ v 7.14.0 (unreleased)
   - Fetch code from forks to refs/merge-requests/:id/head when merge request created
   - Remove satellites
   - Remove comments and email addresses when publicly exposing ssh keys (Zeger-Jan van de Weg)
+  - Improve MR merge widget text and UI consistency.
+  - Improve text in MR "How To Merge" modal.
+  - Add "Check out branch" button to the MR page.
+  - Add "Merge manually..." option to MR accept widget
 v 7.13.3
   - Fix bug causing Bitbucket importer to crash when OAuth application had been removed.

app/views/projects/merge_requests/_show.html.haml

@@ -16,15 +16,10 @@
             %li= link_to "Email Patches", merge_request_path(@merge_request, format: :patch)
             %li= link_to "Plain Diff",    merge_request_path(@merge_request, format: :diff)
       .light
-        %div
-          %span From
-          %span.label-branch #{source_branch_with_namespace(@merge_request)}
-          %span into
-          %span.label-branch #{@merge_request.target_branch}
-        - if @merge_request.open? && !@merge_request.branch_missing?
-          %div
-            If you want to try or merge this request manually, you can use the
-            = link_to "command line", "#modal_merge_info", class: "how_to_merge_link vlink", title: "How To Merge", "data-toggle" => "modal"
+        %span From
+        %span.label-branch #{source_branch_with_namespace(@merge_request)}
+        %span into
+        %span.label-branch #{@merge_request.target_branch}
     = render "projects/merge_requests/show/how_to_merge"
     = render "projects/merge_requests/widget/show.html.haml"

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

@@ -13,6 +13,10 @@
       = link_to "#", class: "modify-merge-commit-link js-toggle-button", title: "Modify merge commit message" do
         %i.fa.fa-edit
         Modify commit message
+    .accept-control
+      = link_to "#modal_merge_info", class: "how_to_merge_link vlink", "data-toggle" => "modal" do
+        = icon('terminal')
+        Merge manually...
     .js-toggle-content.hide.prepend-top-20
       = render 'shared/commit_message_container', params: params,
           text: @merge_request.merge_commit_message,