Mirrors/gitea
0
0 Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2026-10-06 01:44:26 +02:00
Code Issues Activity

[refactor] notify remove unused praram (#9804)

Browse Source
This commit is contained in:
6543 authored and Antoine GIRARD committed 2020-01-16 17:24:20 +01:00
1 parent 11885daaa0
commit 06cd3e03a2
9 files changed
+10 -22
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

services/pull/check.go
+1 -7
View File
@@ -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
services/pull/merge.go
+1 -1
View File
@@ -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))