From 06b5e64be7b51de8b34323804c7fb934260165d6 Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Fri, 8 Nov 2019 15:23:41 +0100
Subject: [PATCH] pull-request: flip the order of comments/merge status.
 Comments should be close to actuall comments

---
 rhodecode/public/css/comments.less                    |  2 +-
 .../templates/pullrequests/pullrequest_show.mako      | 11 ++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/rhodecode/public/css/comments.less b/rhodecode/public/css/comments.less
index 64ba1593..fd2beee1 100644
--- a/rhodecode/public/css/comments.less
+++ b/rhodecode/public/css/comments.less
@@ -425,7 +425,7 @@ form.comment-form {
     }
 
     .comment-footer {
-        margin-bottom: 110px;
+        margin-bottom: 50px;
         margin-top: 10px;
     }
 }
diff --git a/rhodecode/templates/pullrequests/pullrequest_show.mako b/rhodecode/templates/pullrequests/pullrequest_show.mako
index 140dfdd8..f8cf2aa8 100644
--- a/rhodecode/templates/pullrequests/pullrequest_show.mako
+++ b/rhodecode/templates/pullrequests/pullrequest_show.mako
@@ -563,16 +563,17 @@
       ${comment.generate_comments(c.comments, include_pull_request=True, is_pull_request=True)}
 
       % if not c.pull_request.is_closed():
-        ## merge status, and merge action
-        <div class="pull-request-merge">
-            <%include file="/pullrequests/pullrequest_merge_checks.mako"/>
-        </div>
-
         ## main comment form and it status
         ${comment.comments(h.route_path('pullrequest_comment_create', repo_name=c.repo_name,
                                         pull_request_id=c.pull_request.pull_request_id),
                            c.pull_request_review_status,
                            is_pull_request=True, change_status=c.allowed_to_change_status)}
+
+        ## merge status, and merge action
+        <div class="pull-request-merge">
+            <%include file="/pullrequests/pullrequest_merge_checks.mako"/>
+        </div>
+
       %endif
 
       <script type="text/javascript">