Show "delete branch" button on closed pull requests (#6570) (#6601)

* Show button to delete a pull request branch after a pull request has been closed (#6570)

Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com>

* Update routers/repo/pull.go

Co-Authored-By: saitho <mario.lubenka@googlemail.com>

options/locale/locale_en-US.ini

@@ -944,6 +944,7 @@ pulls.tab_conversation = Conversation
 pulls.tab_commits = Commits
 pulls.tab_files = Files Changed
 pulls.reopen_to_merge = Please reopen this pull request to perform a merge.
+pulls.cant_reopen_deleted_branch = This pull request cannot be reopened because the branch was deleted.
 pulls.merged = Merged
 pulls.has_merged = The pull request has been merged.
 pulls.title_wip_desc = `<a href="#">Start the title with <strong>%s</strong></a> to prevent the pull request from being merged accidentally.`

routers/repo/issue.go

@@ -674,6 +674,7 @@ func ViewIssue(ctx *context.Context) {
 			PrepareMergedViewPullInfo(ctx, issue)
 		} else {
 			PrepareViewPullInfo(ctx, issue)
+			ctx.Data["DisableStatusChange"] = ctx.Data["IsPullRequestBroken"] == true && issue.IsClosed
 		}
 		if ctx.Written() {
 			return

routers/repo/pull.go

@@ -999,8 +999,8 @@ func CleanUpPullRequest(ctx *context.Context) {
 
 	pr := issue.PullRequest
 
-	// Allow cleanup only for merged PR
+	// Don't cleanup unmerged and unclosed PRs
-	if !pr.HasMerged {
+	if !pr.HasMerged && !issue.IsClosed {
 		ctx.NotFound("CleanUpPullRequest", nil)
 		return
 	}

templates/repo/issue/view_content/pull.tmpl

@@ -58,8 +58,18 @@
 				{{end}}
 			{{else if .Issue.IsClosed}}
 				<div class="item text grey">
-					{{$.i18n.Tr "repo.pulls.reopen_to_merge"}}
+					{{if .IsPullRequestBroken}}
+						{{$.i18n.Tr "repo.pulls.cant_reopen_deleted_branch"}}
+					{{else}}
+						{{$.i18n.Tr "repo.pulls.reopen_to_merge"}}
+					{{end}}
 				</div>
+				{{if .IsPullBranchDeletable}}
+					<div class="ui divider"></div>
+					<div>
+						<a class="delete-button ui red button" href="" data-url="{{.DeleteBranchLink}}">{{$.i18n.Tr "repo.branch.delete" .HeadTarget}}</a>
+					</div>
+				{{end}}
 			{{else if .IsPullFilesConflicted}}
 				<div class="item text grey">
 					<span class="octicon octicon-x"></span>