--- a/Allura/allura/templates/repo/merge_request.html
+++ b/Allura/allura/templates/repo/merge_request.html
@@ -9,7 +9,7 @@
{% endblock %}
{% block header %}{{c.app.config.options.mount_label}}
-Merge Request #{{req.request_number}}: {{req.summary}}
+Merge Request #{{req.request_number}}: {{req.summary}} ({{req.status}})
{% endblock %}
{% block content %}
@@ -22,14 +22,40 @@
to {{ req.target_branch }}
</p>
- <p>To merge the commits, please execute the following commands in your working
- copy: </p>
- <textarea
- style="width:80%"
- readonly
- >{{ c.app.repo.merge_command(req) | safe }}</textarea>
<div>{{g.markdown.convert(req.description)}}</div>
{{ c.log_widget.display(value=req.commits) }}
+ <div><a href="#discussion_holder">Discuss</a></div>
+
+ {% if h.has_artifact_access('write')() %}
+ <p>To merge the commits, please execute the following commands in your working
+ copy: </p>
+ <textarea
+ style="width:80%"
+ readonly
+ >{{ c.app.repo.merge_command(req) | safe }}</textarea>
+ {{ c.mr_dispose_form.display(action="save", value=dict(status=req.status)) }}
+ <br style="clear:both">
+ {% endif %}
+
+ <div class="title-pane">
+ <h2 class="title">Commits</h2>
+ <div class="content">
+ {{ c.log_widget.display(value=req.commits) }}
+ </div>
+ </div>
{% endblock %}
+
+{% block after_content %}
+ <div id="discussion_holder">
+ <h2>Discussion</h2>
+ {% set thread=req.discussion_thread %}
+ {{c.thread.display(
+ value=thread,
+ new_post_text="New Comment",
+ page=page,
+ limit=limit,
+ count=count)}}
+ </div>
+{% endblock %}