diff options
| author | Mario Lubenka <mario.lubenka@googlemail.com> | 2019-04-20 22:50:34 +0200 |
|---|---|---|
| committer | Lauris BH <lauris@nix.lv> | 2019-04-20 23:50:34 +0300 |
| commit | bc861347597a88ed476ec0124c4c4baf773255c3 (patch) | |
| tree | 9ca8108e4d9b9c1c5f3d6b911b91ab38d9fa01b9 /routers | |
| parent | b1bb700665bdd801e9daac9c2a6013b551aeacec (diff) | |
| download | gitea-bc861347597a88ed476ec0124c4c4baf773255c3.tar.gz gitea-bc861347597a88ed476ec0124c4c4baf773255c3.zip | |
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>
Diffstat (limited to 'routers')
| -rw-r--r-- | routers/repo/issue.go | 1 | ||||
| -rw-r--r-- | routers/repo/pull.go | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/routers/repo/issue.go b/routers/repo/issue.go index c818ac4840..7a681033af 100644 --- a/routers/repo/issue.go +++ b/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 diff --git a/routers/repo/pull.go b/routers/repo/pull.go index 14ab2207b5..0616ee2c77 100644 --- a/routers/repo/pull.go +++ b/routers/repo/pull.go @@ -999,8 +999,8 @@ func CleanUpPullRequest(ctx *context.Context) { pr := issue.PullRequest - // Allow cleanup only for merged PR - if !pr.HasMerged { + // Don't cleanup unmerged and unclosed PRs + if !pr.HasMerged && !issue.IsClosed { ctx.NotFound("CleanUpPullRequest", nil) return } |