@@ -19,7 +19,6 @@ import (
19
19
"code.gitea.io/gitea/models"
20
20
"code.gitea.io/gitea/models/db"
21
21
"code.gitea.io/gitea/models/organization"
22
- pull_model "code.gitea.io/gitea/models/pull"
23
22
repo_model "code.gitea.io/gitea/models/repo"
24
23
"code.gitea.io/gitea/models/unit"
25
24
user_model "code.gitea.io/gitea/models/user"
@@ -36,7 +35,6 @@ import (
36
35
"code.gitea.io/gitea/modules/web/middleware"
37
36
"code.gitea.io/gitea/routers/utils"
38
37
asymkey_service "code.gitea.io/gitea/services/asymkey"
39
- "code.gitea.io/gitea/services/automerge"
40
38
"code.gitea.io/gitea/services/forms"
41
39
"code.gitea.io/gitea/services/gitdiff"
42
40
pull_service "code.gitea.io/gitea/services/pull"
@@ -929,24 +927,6 @@ func MergePullRequest(ctx *context.Context) {
929
927
return
930
928
}
931
929
932
- if form .MergeWhenChecksSucceed {
933
- scheduled , err := automerge .ScheduleAutoMerge (ctx , ctx .Doer , pr , repo_model .MergeStyle (form .Do ), form .MergeTitleField )
934
- if err != nil {
935
- if pull_model .IsErrAlreadyScheduledToAutoMerge (err ) {
936
- ctx .Flash .Success (ctx .Tr ("repo.pulls.merge_on_status_success_already_scheduled" ))
937
- ctx .Redirect (fmt .Sprintf ("%s/pulls/%d" , ctx .Repo .RepoLink , pr .Index ))
938
- return
939
- }
940
- ctx .ServerError ("ScheduleAutoMerge" , err )
941
- return
942
- } else if scheduled {
943
- // nothing more to do ...
944
- ctx .Flash .Success (ctx .Tr ("repo.pulls.merge_on_status_success" ))
945
- ctx .Redirect (fmt .Sprintf ("%s/pulls/%d" , ctx .Repo .RepoLink , pr .Index ))
946
- return
947
- }
948
- }
949
-
950
930
if err := pull_service .Merge (pr , ctx .Doer , ctx .Repo .GitRepo , repo_model .MergeStyle (form .Do ), form .HeadCommitID , form .MergeTitleField ); err != nil {
951
931
if models .IsErrInvalidMergeStyle (err ) {
952
932
ctx .Flash .Error (ctx .Tr ("repo.pulls.invalid_merge_option" ))
@@ -1051,26 +1031,6 @@ func MergePullRequest(ctx *context.Context) {
1051
1031
ctx .Redirect (issue .Link ())
1052
1032
}
1053
1033
1054
- // CancelAutoMergePullRequest cancels a scheduled pr
1055
- func CancelAutoMergePullRequest (ctx * context.Context ) {
1056
- issue := checkPullInfo (ctx )
1057
- if ctx .Written () {
1058
- return
1059
- }
1060
-
1061
- if err := pull_model .RemoveScheduledAutoMerge (ctx , ctx .Doer , issue .PullRequest .ID , true ); err != nil {
1062
- if models .IsErrNotExist (err ) {
1063
- ctx .Flash .Error (ctx .Tr ("repo.pulls.pull_request_not_scheduled" ))
1064
- ctx .Redirect (fmt .Sprintf ("%s/pulls/%d" , ctx .Repo .RepoLink , issue .Index ))
1065
- return
1066
- }
1067
- ctx .ServerError ("RemoveScheduledAutoMerge" , err )
1068
- return
1069
- }
1070
- ctx .Flash .Success (ctx .Tr ("repo.pulls.pull_request_schedule_canceled" ))
1071
- ctx .Redirect (fmt .Sprintf ("%s/pulls/%d" , ctx .Repo .RepoLink , issue .Index ))
1072
- }
1073
-
1074
1034
func stopTimerIfAvailable (user * user_model.User , issue * models.Issue ) error {
1075
1035
if models .StopwatchExists (user .ID , issue .ID ) {
1076
1036
if err := models .CreateOrStopIssueStopwatch (user , issue ); err != nil {
0 commit comments