|
|
|
@ -16,7 +16,9 @@ import ( |
|
|
|
|
"code.gitea.io/gitea/modules/base" |
|
|
|
|
"code.gitea.io/gitea/modules/context" |
|
|
|
|
"code.gitea.io/gitea/modules/log" |
|
|
|
|
"code.gitea.io/gitea/modules/notification" |
|
|
|
|
"code.gitea.io/gitea/modules/setting" |
|
|
|
|
|
|
|
|
|
"github.com/Unknwon/com" |
|
|
|
|
) |
|
|
|
|
|
|
|
|
@ -415,6 +417,8 @@ func MergePullRequest(ctx *context.Context) { |
|
|
|
|
return |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
notification.Service.NotifyIssue(pr.Issue, ctx.User.ID) |
|
|
|
|
|
|
|
|
|
log.Trace("Pull request merged: %d", pr.ID) |
|
|
|
|
ctx.Redirect(ctx.Repo.RepoLink + "/pulls/" + com.ToStr(pr.Index)) |
|
|
|
|
} |
|
|
|
@ -707,6 +711,8 @@ func CompareAndPullRequestPost(ctx *context.Context, form auth.CreateIssueForm) |
|
|
|
|
return |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
notification.Service.NotifyIssue(pullIssue, ctx.User.ID) |
|
|
|
|
|
|
|
|
|
log.Trace("Pull request created: %d/%d", repo.ID, pullIssue.ID) |
|
|
|
|
ctx.Redirect(ctx.Repo.RepoLink + "/pulls/" + com.ToStr(pullIssue.Index)) |
|
|
|
|
} |
|
|
|
|