Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-11-06 13:35:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

(refs #2)Experimental implementation of merge pull request.

Browse Source
This commit is contained in:
takezoe
2013-07-15 03:23:28 +09:00
parent b68977597b
commit fd7d387fb0
3 changed files with 106 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/scala/service/ActivityService.scala
View File

@@ -117,6 +117,13 @@ trait ActivityService {
Some(title),
currentDate)
def recordMergeActivity(userName: String, repositoryName: String, activityUserName: String, issueId: Int, message: String): Unit =
Activities.autoInc insert(userName, repositoryName, activityUserName,
"merge_pullreq",
s"[user:${activityUserName}] merged pull request [pullreq:${userName}/${repositoryName}#${issueId}]",
Some(message),
currentDate)
def insertCommitId(userName: String, repositoryName: String, commitId: String) = {
CommitLog insert (userName, repositoryName, commitId)
}