From 31a08abff2925f856a61e5a1b10c87798949acc7 Mon Sep 17 00:00:00 2001
From: Naoki Takezoe <takezoe@gmail.com>
Date: Mon, 2 Jun 2014 21:34:03 +0900
Subject: [PATCH] (refs #378)"Delete branch" button is displayed for only
 merged pull requests

---
 src/main/twirl/pulls/conversation.scala.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/twirl/pulls/conversation.scala.html b/src/main/twirl/pulls/conversation.scala.html
index f5ba2c205..0a3f2a2bc 100644
--- a/src/main/twirl/pulls/conversation.scala.html
+++ b/src/main/twirl/pulls/conversation.scala.html
@@ -38,7 +38,7 @@
           </div>
         </div>
       }
-      @if(hasWritePermission && issue.closed && pullreq.userName == pullreq.requestUserName &&
+      @if(hasWritePermission && issue.closed && pullreq.userName == pullreq.requestUserName && merged &&
         pullreq.repositoryName == pullreq.requestRepositoryName && repository.branchList.contains(pullreq.requestBranch)){
         <div class="box issue-comment-box" style="background-color: #d0eeff;">
           <div class="box-content"class="issue-content" style="border: 1px solid #87a8c9; padding: 10px;">