From 393ea86ae192325e45d7fac0fc6a277da8fb0fca Mon Sep 17 00:00:00 2001
From: zeripath <art27@cantab.net>
Date: Fri, 11 Feb 2022 08:02:53 +0000
Subject: [PATCH] Always set PullRequestWorkInProgressPrefixes in
PrepareViewPullInfo (#18713)
Move setting PullRequestWorkInProgressPrefixes to the start of PrepareViewPullInfo.
Fix #18706
Signed-off-by: Andrew Thornton <art27@cantab.net>
---
routers/web/repo/pull.go | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/routers/web/repo/pull.go b/routers/web/repo/pull.go
index 9c575165a4..1ac3e51e41 100644
--- a/routers/web/repo/pull.go
+++ b/routers/web/repo/pull.go
@@ -390,6 +390,8 @@ func PrepareMergedViewPullInfo(ctx *context.Context, issue *models.Issue) *git.C
// PrepareViewPullInfo show meta information for a pull request preview page
func PrepareViewPullInfo(ctx *context.Context, issue *models.Issue) *git.CompareInfo {
+ ctx.Data["PullRequestWorkInProgressPrefixes"] = setting.Repository.PullRequest.WorkInProgressPrefixes
+
repo := ctx.Repo.Repository
pull := issue.PullRequest
@@ -579,8 +581,6 @@ func PrepareViewPullInfo(ctx *context.Context, issue *models.Issue) *git.Compare
ctx.Data["IsNothingToCompare"] = true
}
- ctx.Data["PullRequestWorkInProgressPrefixes"] = setting.Repository.PullRequest.WorkInProgressPrefixes
-
if pull.IsWorkInProgress() {
ctx.Data["IsPullWorkInProgress"] = true
ctx.Data["WorkInProgressPrefix"] = pull.GetWorkInProgressPrefix()