From d882f20436198bd22b5eb4efb1c5664f187a2cec Mon Sep 17 00:00:00 2001
From: takezoe <takezoe@gmail.com>
Date: Tue, 4 Feb 2014 17:20:48 +0900
Subject: [PATCH] (refs #254)Change comment action to "delete_branch" from
 "delete".

---
 src/main/scala/app/PullRequestsController.scala | 2 +-
 src/main/twirl/issues/commentlist.scala.html    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/scala/app/PullRequestsController.scala b/src/main/scala/app/PullRequestsController.scala
index 806d8f864..c3d110a45 100644
--- a/src/main/scala/app/PullRequestsController.scala
+++ b/src/main/scala/app/PullRequestsController.scala
@@ -113,7 +113,7 @@ trait PullRequestsControllerBase extends ControllerBase {
           recordDeleteBranchActivity(repository.owner, repository.name, userName, branchName)
         }
       }
-      createComment(repository.owner, repository.name, userName, issueId, branchName, "delete")
+      createComment(repository.owner, repository.name, userName, issueId, branchName, "delete_branch")
       redirect(s"/${repository.owner}/${repository.name}/pull/${issueId}")
     } getOrElse NotFound
   })
diff --git a/src/main/twirl/issues/commentlist.scala.html b/src/main/twirl/issues/commentlist.scala.html
index 92f604106..7bc168fb4 100644
--- a/src/main/twirl/issues/commentlist.scala.html
+++ b/src/main/twirl/issues/commentlist.scala.html
@@ -6,7 +6,7 @@
 @import context._
 @import view.helpers._
 @comments.map { comment =>
-  @if(comment.action != "close" && comment.action != "reopen" && comment.action != "delete"){
+  @if(comment.action != "close" && comment.action != "reopen" && comment.action != "delete_branch"){
     <div class="issue-avatar-image">@avatar(comment.commentedUserName, 48)</div>
     <div class="box issue-comment-box" id="comment-@comment.commentId">
       <div class="box-header-small">
@@ -63,7 +63,7 @@
       @user(comment.commentedUserName, styleClass="username strong") reopened the issue @datetime(comment.registeredDate)
     </div>
   }
-  @if(comment.action == "delete"){
+  @if(comment.action == "delete_branch"){
     <div class="small issue-comment-action">
       <span class="label">Deleted</span>
       @avatar(comment.commentedUserName, 20)