diff options
| author | 6543 <6543@obermui.de> | 2022-05-03 21:46:28 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-03 21:46:28 +0200 |
| commit | 92f139d091c906cc6d30599101d45c62a208f585 (patch) | |
| tree | e7be0dfc3cd9ae0611bd7cfa11cc1ee277e756fd /modules/convert | |
| parent | 730420b6b32414db7fcd12ede87712b0f960de7b (diff) | |
| download | gitea-92f139d091c906cc6d30599101d45c62a208f585.tar.gz gitea-92f139d091c906cc6d30599101d45c62a208f585.zip | |
Use for a repo action one database transaction (#19576)
... more context
(part of #9307)
Diffstat (limited to 'modules/convert')
| -rw-r--r-- | modules/convert/convert.go | 2 |
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 |