Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Always set PullRequestWorkInProgressPrefixes in PrepareViewPullInfo #18713

Merged
merged 3 commits into from Feb 11, 2022
Merged

Always set PullRequestWorkInProgressPrefixes in PrepareViewPullInfo #18713

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
058d5eb
Always set PullRequestWorkInProgressPrefixes in PrepareViewPullInfo
zeripath Feb 10, 2022
efacb84
Merge branch 'main' into fix-18706-prevent-NPE-in-pull-requests
lunny Feb 11, 2022
8e3f7de
Merge branch 'main' into fix-18706-prevent-NPE-in-pull-requests
lunny Feb 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions routers/web/repo/pull.go
View file
Open in desktop
Expand Up @@ -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

Expand Down Expand Up @@ -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()
Expand Down