engineering/unrhodecode
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

pull-request: flip the order of comments/merge status. Comments should be close to actuall comments

Browse source
This commit is contained in:
Marcin Kuzminski 2019-11-08 15:23:41 +01:00
parent 603a3c0545
commit 06b5e64be7
2 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
rhodecode/public/css/comments.less
View file

@ -425,7 +425,7 @@ form.comment-form {
}
.comment-footer {
margin-bottom: 110px;
margin-bottom: 50px;
margin-top: 10px;
}
}

11
rhodecode/templates/pullrequests/pullrequest_show.mako
View file

@ -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">