Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-11-11 16:05:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

(refs #378)"Delete branch" button is displayed for only merged pull requests

Browse Source
This commit is contained in:
Naoki Takezoe
2014-06-02 21:34:03 +09:00
parent 0fa1e11c5a
commit 31a08abff2
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/twirl/pulls/conversation.scala.html
View File

@@ -38,7 +38,7 @@
</div> </div>
</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)){ pullreq.repositoryName == pullreq.requestRepositoryName && repository.branchList.contains(pullreq.requestBranch)){
<div class="box issue-comment-box" style="background-color: #d0eeff;"> <div class="box issue-comment-box" style="background-color: #d0eeff;">
<div class="box-content"class="issue-content" style="border: 1px solid #87a8c9; padding: 10px;"> <div class="box-content"class="issue-content" style="border: 1px solid #87a8c9; padding: 10px;">