Move "modify merge message link" to the right to prevent accidently hiting accept button

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

1 files changed, 8 insertions, 9 deletions

diff --git a/app/views/projects/merge_requests/show/_mr_accept.html.haml b/app/views/projects/merge_requests/show/_mr_accept.html.haml
index 213e14268c2..4939ae03994 100644
--- a/app/views/projects/merge_requests/show/_mr_accept.html.haml
+++ b/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