From 706f314861eda967193c14b60ac07d0334e9881b Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Mar 24 2014 12:21:43 +0000
Subject: Let the pull-request view inherit from repo_master and display its status


---

diff --git a/progit/templates/pull_request.html b/progit/templates/pull_request.html
index 4bbb9a3..a4bc08c 100644
--- a/progit/templates/pull_request.html
+++ b/progit/templates/pull_request.html
@@ -1,11 +1,11 @@
-{% extends "master.html" %}
+{% extends "repo_master.html" %}
 {% from "_formhelper.html" import render_field_in_row %}
 
 {% block title %}Home{% endblock %}
 {%block tag %}home{% endblock %}
 
 
-{% block content %}
+{% block repo %}
 
 <h2>Request pull
   {% if '/fork/' in request.url %}
@@ -30,6 +30,21 @@
 
 {% if request %}
 <h3>Title: {{ request.title }}</h3>
+  {% if request.status %}
+  <span>
+      {% if '/fork/' in request.url %}
+        <a href="{{ url_for('fork_merge_request_pull', username=username,
+                  repo=repo.name, requestid=request.id) }}" class="message">
+        {% else %}
+        <a href="{{ url_for('merge_request_pull',
+                  repo=repo.name, requestid=request.id) }}" class="message">
+        {% endif %}
+        Merge
+      </a>
+  </span>
+  {% else %}
+  <span class="error">Merged</span>
+  {% endif %}
 {% endif %}
 
 <section class="commit_list">