Merge remote-tracking branch 'giteaofficial/main'

* giteaofficial/main: Always set PullRequestWorkInProgressPrefixes in PrepareViewPullInfo (go-gitea#18713)
zjjhot · Feb 11, 2022 · 0f73b87 · 0f73b87
2 parents 47394fb + 393ea86
commit 0f73b87
Showing 1 changed file with 2 additions and 2 deletions.
diff --git 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()