mirror of
https://github.com/go-gitea/gitea
synced 2024-10-14 16:59:59 +02:00
remove stopTimerIfAvailable
This commit is contained in:
parent
078d120ac5
commit
802efa342d
@ -3080,13 +3080,6 @@ func NewComment(ctx *context.Context) {
|
|||||||
}
|
}
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
} else {
|
|
||||||
if err := stopTimerIfAvailable(ctx, ctx.Doer, issue); err != nil {
|
|
||||||
ctx.ServerError("CreateOrStopIssueStopwatch", err)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
log.Trace("Issue [%d] status changed to closed: %v", issue.ID, issue.IsClosed)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1153,13 +1153,6 @@ func MergePullRequest(ctx *context.Context) {
|
|||||||
}
|
}
|
||||||
log.Trace("Pull request merged: %d", pr.ID)
|
log.Trace("Pull request merged: %d", pr.ID)
|
||||||
|
|
||||||
if err := stopTimerIfAvailable(ctx, ctx.Doer, issue); err != nil {
|
|
||||||
ctx.ServerError("stopTimerIfAvailable", err)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
log.Trace("Pull request merged: %d", pr.ID)
|
|
||||||
|
|
||||||
if form.DeleteBranchAfterMerge {
|
if form.DeleteBranchAfterMerge {
|
||||||
// Don't cleanup when other pr use this branch as head branch
|
// Don't cleanup when other pr use this branch as head branch
|
||||||
exist, err := issues_model.HasUnmergedPullRequestsByHeadInfo(ctx, pr.HeadRepoID, pr.HeadBranch)
|
exist, err := issues_model.HasUnmergedPullRequestsByHeadInfo(ctx, pr.HeadRepoID, pr.HeadBranch)
|
||||||
@ -1209,16 +1202,6 @@ func CancelAutoMergePullRequest(ctx *context.Context) {
|
|||||||
ctx.Redirect(fmt.Sprintf("%s/pulls/%d", ctx.Repo.RepoLink, issue.Index))
|
ctx.Redirect(fmt.Sprintf("%s/pulls/%d", ctx.Repo.RepoLink, issue.Index))
|
||||||
}
|
}
|
||||||
|
|
||||||
func stopTimerIfAvailable(ctx *context.Context, user *user_model.User, issue *issues_model.Issue) error {
|
|
||||||
if issues_model.StopwatchExists(ctx, user.ID, issue.ID) {
|
|
||||||
if err := issues_model.CreateOrStopIssueStopwatch(ctx, user, issue); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// CompareAndPullRequestPost response for creating pull request
|
// CompareAndPullRequestPost response for creating pull request
|
||||||
func CompareAndPullRequestPost(ctx *context.Context) {
|
func CompareAndPullRequestPost(ctx *context.Context) {
|
||||||
form := web.GetForm(ctx).(*forms.CreateIssueForm)
|
form := web.GetForm(ctx).(*forms.CreateIssueForm)
|
||||||
|
Loading…
Reference in New Issue
Block a user