fix NPE

everhopingandwaiting · everhopingandwaiting · commit 7755e107b09e · 2020-04-05T07:05:18.000+08:00
diff --git a/services/pull/merge.go b/services/pull/merge.go
@@ -537,7 +537,7 @@ func IsUserAllowedToMerge(pr *models.PullRequest, p models.Permission, user *mod
 		return false, err
 	}
 
-	if (p.CanWrite(models.UnitTypeCode) && pr.ProtectedBranch == nil) || pr.ProtectedBranch.IsUserMergeWhitelisted(user.ID) {
+	if (p.CanWrite(models.UnitTypeCode) && pr.ProtectedBranch == nil) || (pr.ProtectedBranch != nil && pr.ProtectedBranch.IsUserMergeWhitelisted(user.ID)) {
 		return true, nil
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -537,7 +537,7 @@ func IsUserAllowedToMerge(pr models.PullRequest, p models.Permission, user mod`
`537`	`537`	`return false, err`
`538`	`538`	`}`
`539`	`539`
`540`		`- if (p.CanWrite(models.UnitTypeCode) && pr.ProtectedBranch == nil) \|\| pr.ProtectedBranch.IsUserMergeWhitelisted(user.ID) {`
	`540`	`+ if (p.CanWrite(models.UnitTypeCode) && pr.ProtectedBranch == nil) \|\| (pr.ProtectedBranch != nil && pr.ProtectedBranch.IsUserMergeWhitelisted(user.ID)) {`
`541`	`541`	`return true, nil`
`542`	`542`	`}`
`543`	`543`