Skip to content

Commit 6566141

Browse files
committed
remove more WebUI only parts
1 parent 9f43fc9 commit 6566141

File tree

2 files changed

+0
-41
lines changed

2 files changed

+0
-41
lines changed

routers/web/repo/pull.go

Lines changed: 0 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ import (
1919
"code.gitea.io/gitea/models"
2020
"code.gitea.io/gitea/models/db"
2121
"code.gitea.io/gitea/models/organization"
22-
pull_model "code.gitea.io/gitea/models/pull"
2322
repo_model "code.gitea.io/gitea/models/repo"
2423
"code.gitea.io/gitea/models/unit"
2524
user_model "code.gitea.io/gitea/models/user"
@@ -36,7 +35,6 @@ import (
3635
"code.gitea.io/gitea/modules/web/middleware"
3736
"code.gitea.io/gitea/routers/utils"
3837
asymkey_service "code.gitea.io/gitea/services/asymkey"
39-
"code.gitea.io/gitea/services/automerge"
4038
"code.gitea.io/gitea/services/forms"
4139
"code.gitea.io/gitea/services/gitdiff"
4240
pull_service "code.gitea.io/gitea/services/pull"
@@ -929,24 +927,6 @@ func MergePullRequest(ctx *context.Context) {
929927
return
930928
}
931929

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-
950930
if err := pull_service.Merge(pr, ctx.Doer, ctx.Repo.GitRepo, repo_model.MergeStyle(form.Do), form.HeadCommitID, form.MergeTitleField); err != nil {
951931
if models.IsErrInvalidMergeStyle(err) {
952932
ctx.Flash.Error(ctx.Tr("repo.pulls.invalid_merge_option"))
@@ -1051,26 +1031,6 @@ func MergePullRequest(ctx *context.Context) {
10511031
ctx.Redirect(issue.Link())
10521032
}
10531033

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-
10741034
func stopTimerIfAvailable(user *user_model.User, issue *models.Issue) error {
10751035
if models.StopwatchExists(user.ID, issue.ID) {
10761036
if err := models.CreateOrStopIssueStopwatch(user, issue); err != nil {

routers/web/web.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1108,7 +1108,6 @@ func RegisterRoutes(m *web.Route) {
11081108
m.Get(".patch", repo.DownloadPullPatch)
11091109
m.Get("/commits", context.RepoRef(), repo.ViewPullCommits)
11101110
m.Post("/merge", context.RepoMustNotBeArchived(), bindIgnErr(forms.MergePullRequestForm{}), repo.MergePullRequest)
1111-
m.Post("/cancel_auto_merge", context.RepoMustNotBeArchived(), repo.CancelAutoMergePullRequest)
11121111
m.Post("/update", repo.UpdatePullRequest)
11131112
m.Post("/set_allow_maintainer_edit", bindIgnErr(forms.UpdateAllowEditsForm{}), repo.SetAllowEdits)
11141113
m.Post("/cleanup", context.RepoMustNotBeArchived(), context.RepoRef(), repo.CleanUpPullRequest)

0 commit comments

Comments
 (0)