summaryrefslogtreecommitdiffstats
path: root/services/repository/files/commit.go
diff options
context:
space:
mode:
Diffstat (limited to 'services/repository/files/commit.go')
-rw-r--r--services/repository/files/commit.go7
1 files changed, 7 insertions, 0 deletions
diff --git a/services/repository/files/commit.go b/services/repository/files/commit.go
index e7604e3f92..6ecabb4020 100644
--- a/services/repository/files/commit.go
+++ b/services/repository/files/commit.go
@@ -14,6 +14,7 @@ import (
user_model "code.gitea.io/gitea/models/user"
"code.gitea.io/gitea/modules/git"
"code.gitea.io/gitea/modules/structs"
+ "code.gitea.io/gitea/services/automerge"
)
// CreateCommitStatus creates a new CommitStatus given a bunch of parameters
@@ -44,6 +45,12 @@ func CreateCommitStatus(ctx context.Context, repo *repo_model.Repository, creato
return fmt.Errorf("NewCommitStatus[repo_id: %d, user_id: %d, sha: %s]: %v", repo.ID, creator.ID, sha, err)
}
+ if status.State.IsSuccess() {
+ if err := automerge.MergeScheduledPullRequest(ctx, sha, repo); err != nil {
+ return fmt.Errorf("MergeScheduledPullRequest[repo_id: %d, user_id: %d, sha: %s]: %w", repo.ID, creator.ID, sha, err)
+ }
+ }
+
return nil
}