Fix bug on branch API (#10767)

go-gitea · Mar 19, 2020 · 83fe7d4 · 83fe7d4
1 parent 661289d
commit 83fe7d4
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/modules/convert/convert.go b/modules/convert/convert.go
@@ -49,17 +49,21 @@ func ToBranch(repo *models.Repository, b *git.Branch, c *git.Commit, bp *models.
 		branchProtectionName = bp.BranchName
 	}
 
-	return &api.Branch{
+	branch := &api.Branch{
 		Name:                          b.Name,
 		Commit:                        ToCommit(repo, c),
 		Protected:                     true,
 		RequiredApprovals:             bp.RequiredApprovals,
 		EnableStatusCheck:             bp.EnableStatusCheck,
 		StatusCheckContexts:           bp.StatusCheckContexts,
-		UserCanPush:                   bp.CanUserPush(user.ID),
-		UserCanMerge:                  bp.IsUserMergeWhitelisted(user.ID),
 		EffectiveBranchProtectionName: branchProtectionName,
 	}
+
+	if user != nil {
+		branch.UserCanPush = bp.CanUserPush(user.ID)
+		branch.UserCanMerge = bp.IsUserMergeWhitelisted(user.ID)
+	}
+	return branch
 }
 
 // ToBranchProtection convert a ProtectedBranch to api.BranchProtection