diff options
| author | 6543 <6543@obermui.de> | 2020-01-16 17:24:20 +0100 |
|---|---|---|
| committer | Antoine GIRARD <sapk@users.noreply.github.com> | 2020-01-16 17:24:20 +0100 |
| commit | 06cd3e03a24e23d2d838cda6eb1edd5e7474ad42 (patch) | |
| tree | 357d85714ac01f66737a26c7a4c72309989ca976 /services | |
| parent | 11885daaa0397d02d7acd559234b098dfd239d49 (diff) | |
| download | gitea-06cd3e03a24e23d2d838cda6eb1edd5e7474ad42.tar.gz gitea-06cd3e03a24e23d2d838cda6eb1edd5e7474ad42.zip | |
[refactor] notify remove unused praram (#9804)
Diffstat (limited to 'services')
| -rw-r--r-- | services/pull/check.go | 8 | ||||
| -rw-r--r-- | services/pull/merge.go | 2 |
2 files changed, 2 insertions, 8 deletions
diff --git a/services/pull/check.go b/services/pull/check.go index c5d8a585cb..5d380b4609 100644 --- a/services/pull/check.go +++ b/services/pull/check.go @@ -147,13 +147,7 @@ func manuallyMerged(pr *models.PullRequest) bool { 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) + notification.NotifyMergePullRequest(pr, merger) 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 diff --git a/services/pull/merge.go b/services/pull/merge.go index f6f0abe836..5e077f6dc0 100644 --- a/services/pull/merge.go +++ b/services/pull/merge.go @@ -350,7 +350,7 @@ func Merge(pr *models.PullRequest, doer *models.User, baseGitRepo *git.Repositor log.Error("setMerged [%d]: %v", pr.ID, err) } - notification.NotifyMergePullRequest(pr, doer, baseGitRepo) + notification.NotifyMergePullRequest(pr, doer) // Reset cached commit count cache.Remove(pr.Issue.Repo.GetCommitsCountCacheKey(pr.BaseBranch, true)) |