Merge branch 'improve-mr-widgets' into 'master'

app/assets/stylesheets/sections/merge_requests.scss

@@ -111,7 +111,8 @@
   .ci_widget {
     padding: 10px 15px;
     font-size: 15px;
-    border-bottom: 1px dashed #AAA;
+    border-bottom: 1px solid #BBB;
+    color: #777;
 
     &.ci-success {
       color: $bg_success;
@@ -143,7 +144,8 @@
     padding: 10px 15px;
 
     h4 {
-      margin-top: 0px;
+      font-size: 20px;
+      font-weight: normal;
     }
 
     p:last-child {

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

@@ -16,15 +16,6 @@
         %h4
           You can accept this request automatically.
         .accept-merge-holder.clearfix
-          .js-toggle-container
-            %p
-              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
-              = render 'shared/commit_message_container', params: params,
-                  text: @merge_request.merge_commit_message,
-                  rows: 14, hint: true
           .accept-group
             .pull-left
               = f.submit "Accept Merge Request", class: "btn btn-create accept_merge_request"
@@ -33,6 +24,14 @@
                 = 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
 
         %hr
         .light