Skip to content

Fix 500 when review pull request with anonymous #17594

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

Merged
merged 5 commits into from
Nov 9, 2021
Merged

Fix 500 when review pull request with anonymous #17594

Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5bdb6ff
Fix 500 when review pull request with anonymous
lunny Nov 9, 2021
509e5bd
Merge branch 'main' into lunny/fix_pr_merge_instruction_bug
wxiaoguang Nov 9, 2021
2d81164
Merge branch 'main' into lunny/fix_pr_merge_instruction_bug
lunny Nov 9, 2021
c32a260
Merge branch 'main' into lunny/fix_pr_merge_instruction_bug
wxiaoguang Nov 9, 2021
e774c13
Merge branch 'main' into lunny/fix_pr_merge_instruction_bug
wxiaoguang Nov 9, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion routers/web/repo/issue.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1545,6 +1545,10 @@ func ViewIssue(ctx *context.Context) {
}
ctx.Data["ShowMergeInstructions"] = true
if pull.ProtectedBranch != nil {
var showMergeInstructions bool
if ctx.User != nil {
showMergeInstructions = pull.ProtectedBranch.CanUserPush(ctx.User.ID)
}
cnt := pull.ProtectedBranch.GetGrantedApprovalsCount(pull)
ctx.Data["IsBlockedByApprovals"] = !pull.ProtectedBranch.HasEnoughApprovals(pull)
ctx.Data["IsBlockedByRejection"] = pull.ProtectedBranch.MergeBlockedByRejectedReview(pull)
Expand All @@ -1555,7 +1559,7 @@ func ViewIssue(ctx *context.Context) {
ctx.Data["ChangedProtectedFiles"] = pull.ChangedProtectedFiles
ctx.Data["IsBlockedByChangedProtectedFiles"] = len(pull.ChangedProtectedFiles) != 0
ctx.Data["ChangedProtectedFilesNum"] = len(pull.ChangedProtectedFiles)
ctx.Data["ShowMergeInstructions"] = pull.ProtectedBranch.CanUserPush(ctx.User.ID)
ctx.Data["ShowMergeInstructions"] = showMergeInstructions
}
ctx.Data["WillSign"] = false
if ctx.User != nil {
Expand Down