diff options
| author | Lunny Xiao <xiaolunwen@gmail.com> | 2019-12-16 05:57:34 +0800 |
|---|---|---|
| committer | techknowlogick <techknowlogick@gitea.io> | 2019-12-15 16:57:34 -0500 |
| commit | 67b316a954b161cac27e16b6455837881919dd94 (patch) | |
| tree | 46e0278f556447cd9228d63c49a32dacea1f3352 /services | |
| parent | c6b3c5bcefde6be4c64f5769a38962c2ce6ad6de (diff) | |
| download | gitea-67b316a954b161cac27e16b6455837881919dd94.tar.gz gitea-67b316a954b161cac27e16b6455837881919dd94.zip | |
Refactor comment (#9330)
* Refactor comment
* fix test
* improve code
Diffstat (limited to 'services')
| -rw-r--r-- | services/issue/status.go | 4 | ||||
| -rw-r--r-- | services/pull/check.go | 10 |
2 files changed, 12 insertions, 2 deletions
diff --git a/services/issue/status.go b/services/issue/status.go index 0df08eafd1..b01ce4bbb8 100644 --- a/services/issue/status.go +++ b/services/issue/status.go @@ -11,11 +11,11 @@ import ( // ChangeStatus changes issue status to open or closed. func ChangeStatus(issue *models.Issue, doer *models.User, isClosed bool) (err error) { - err = issue.ChangeStatus(doer, isClosed) + comment, err := issue.ChangeStatus(doer, isClosed) if err != nil { return } - notification.NotifyIssueChangeStatus(doer, issue, isClosed) + notification.NotifyIssueChangeStatus(doer, issue, comment, isClosed) return nil } diff --git a/services/pull/check.go b/services/pull/check.go index 7344f071ac..db25361b6d 100644 --- a/services/pull/check.go +++ b/services/pull/check.go @@ -19,6 +19,7 @@ import ( "code.gitea.io/gitea/modules/git" "code.gitea.io/gitea/modules/graceful" "code.gitea.io/gitea/modules/log" + "code.gitea.io/gitea/modules/notification" "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/sync" "code.gitea.io/gitea/modules/timeutil" @@ -145,6 +146,15 @@ func manuallyMerged(pr *models.PullRequest) bool { log.Error("PullRequest[%d].setMerged : %v", pr.ID, err) return false } + + baseGitRepo, err := git.OpenRepository(pr.BaseRepo.RepoPath()) + if err != nil { + log.Error("OpenRepository[%s] : %v", pr.BaseRepo.RepoPath(), err) + return false + } + + notification.NotifyMergePullRequest(pr, merger, baseGitRepo) + log.Info("manuallyMerged[%d]: Marked as manually merged into %s/%s by commit id: %s", pr.ID, pr.BaseRepo.Name, pr.BaseBranch, commit.ID.String()) return true } |