diff options
| author | Lunny Xiao <xiaolunwen@gmail.com> | 2019-11-15 16:06:11 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-15 16:06:11 +0800 |
| commit | 21ae9838e04233bbf9930d368d935fd1f9b68c34 (patch) | |
| tree | 610abb6f1ec2df235d469276b36f6d26e00e4653 /services/pull/merge.go | |
| parent | b30d744e0986dcf716d4f57dac8c72a494bb226b (diff) | |
| download | gitea-21ae9838e04233bbf9930d368d935fd1f9b68c34.tar.gz gitea-21ae9838e04233bbf9930d368d935fd1f9b68c34.zip | |
Move transfer repository and rename repository on a service package and start action notification (#8573)
* move transfer repository and rename repository on a service package and start action notification
* remove unused codes
* fix lint
* fix bugs
* fix test
* fix test
* fix test
* fix lint
* update go mod and sum
Diffstat (limited to 'services/pull/merge.go')
| -rw-r--r-- | services/pull/merge.go | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/services/pull/merge.go b/services/pull/merge.go index 5fbf550ad2..7dc3c07338 100644 --- a/services/pull/merge.go +++ b/services/pull/merge.go @@ -424,8 +424,16 @@ func Merge(pr *models.PullRequest, doer *models.User, baseGitRepo *git.Repositor log.Error("setMerged [%d]: %v", pr.ID, err) } - if err = models.MergePullRequestAction(doer, pr.Issue.Repo, pr.Issue); err != nil { - log.Error("MergePullRequestAction [%d]: %v", pr.ID, err) + if err := models.NotifyWatchers(&models.Action{ + ActUserID: doer.ID, + ActUser: doer, + OpType: models.ActionMergePullRequest, + Content: fmt.Sprintf("%d|%s", pr.Issue.Index, pr.Issue.Title), + RepoID: pr.Issue.Repo.ID, + Repo: pr.Issue.Repo, + IsPrivate: pr.Issue.Repo.IsPrivate, + }); err != nil { + log.Error("NotifyWatchers [%d]: %v", pr.ID, err) } // Reset cached commit count |