summaryrefslogtreecommitdiffstats
path: root/modules/convert
diff options
context:
space:
mode:
Diffstat (limited to 'modules/convert')
-rw-r--r--modules/convert/convert.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/convert/convert.go b/modules/convert/convert.go
index bd06f4dbf4..3a12ed8f1f 100644
--- a/modules/convert/convert.go
+++ b/modules/convert/convert.go
@@ -87,7 +87,7 @@ func ToBranch(repo *repo_model.Repository, b *git.Branch, c *git.Commit, bp *mod
return nil, err
}
branch.UserCanPush = bp.CanUserPush(user.ID)
- branch.UserCanMerge = models.IsUserMergeWhitelisted(bp, user.ID, permission)
+ branch.UserCanMerge = models.IsUserMergeWhitelisted(db.DefaultContext, bp, user.ID, permission)
}
return branch, nil