tdsds.com/gitea
1
1
Fork 0
mirror of https://github.com/go-gitea/gitea synced 2025-11-01 03:48:24 +00:00
Code Releases Activity

Merge branch 'main' into feature/bots

Browse Source
This commit is contained in:
Jason Song
2022-12-05 14:31:00 +08:00
parent b0d6c7b86e a08584ee36
commit bd1af5b7f8
163 changed files with 471 additions and 447 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/repository/push.go
View File

@@ -81,7 +81,7 @@ func pushUpdates(optsList []*repo_module.PushUpdateOptions) error {
ctx, _, finished := process.GetManager().AddContext(graceful.GetManager().HammerContext(), fmt.Sprintf("PushUpdates: %s/%s", optsList[0].RepoUserName, optsList[0].RepoName))
defer finished()
repo, err := repo_model.GetRepositoryByOwnerAndName(optsList[0].RepoUserName, optsList[0].RepoName)
repo, err := repo_model.GetRepositoryByOwnerAndName(ctx, optsList[0].RepoUserName, optsList[0].RepoName)
if err != nil {
return fmt.Errorf("GetRepositoryByOwnerAndName failed: %w", err)
}
@@ -112,7 +112,7 @@ func pushUpdates(optsList []*repo_module.PushUpdateOptions) error {
pusher = user_model.NewBotUser()
} else {
var err error
if pusher, err = user_model.GetUserByID(opts.PusherID); err != nil {
if pusher, err = user_model.GetUserByID(ctx, opts.PusherID); err != nil {
return err
}
}
@@ -156,7 +156,7 @@ func pushUpdates(optsList []*repo_module.PushUpdateOptions) error {
pusher = user_model.NewBotUser()
} else {
var err error
if pusher, err = user_model.GetUserByID(opts.PusherID); err != nil {
if pusher, err = user_model.GetUserByID(ctx, opts.PusherID); err != nil {
return err
}
}