From 840d945152593f379990abbf680bef4de25d46e9 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Jun 04 2014 10:32:48 +0000
Subject: Fix displaying the Merge button/Merged status in the pull_request template


---

diff --git a/progit/templates/pull_request.html b/progit/templates/pull_request.html
index 10763e1..b256a8e 100644
--- a/progit/templates/pull_request.html
+++ b/progit/templates/pull_request.html
@@ -20,14 +20,14 @@
 
 {% if request %}
 <h3>Title: {{ request.title }}</h3>
-  {% if request.status and repo_admin%}
+  {% if request.status and repo_admin %}
   <span>
     <a href="{{ url_for('merge_request_pull', username=username,
               repo=repo.name, requestid=request.id) }}" class="message">
       Merge
     </a>
   </span>
-  {% elif not request.status %}
+  {% elif request and request.status == False %}
   <span class="error">Merged</span>
   {% endif %}
 {% endif %}