--- a/Allura/allura/templates/repo/merge_request.html
+++ b/Allura/allura/templates/repo/merge_request.html
@@ -26,24 +26,17 @@
{{ c.log_widget.display(value=req.commits) }}
<div class="grid-19"><a href="#discussion_holder">Discuss</a></div>
-
+
{% if h.has_access(c.app, 'write')() %}
- <p>To merge the commits, please execute the following commands in your working
- copy: </p>
+ <div class="grid-19">To merge the commits, please execute the following commands in your working
+ copy: </div>
<div class="grid-19"><textarea
- style="width:80%"
+ style="width:80%; height:60px;"
readonly
>{{ c.app.repo.merge_command(req) | safe }}</textarea></div>
{{ c.mr_dispose_form.display(action="save", value=dict(status=req.status)) }}
<br style="clear:both">
{% endif %}
-
- <div class="title-pane grid-19">
- <h2 class="title">Commits</h2>
- <div class="content">
- {{ c.log_widget.display(value=req.commits) }}
- </div>
- </div>
{% endblock %}