Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-11-07 05:55:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

(refs #2)Fix comparing diffs before sending pull request.

Browse Source
This commit is contained in:
takezoe
2013-07-15 21:40:54 +09:00
parent 5ea9150af8
commit fc29b34573
4 changed files with 61 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/scala/app/WikiController.scala
View File

@@ -59,7 +59,7 @@ trait WikiControllerBase extends ControllerBase {
val commitId = params("commitId").split("\\.\\.\\.")
JGitUtil.withGit(getWikiRepositoryDir(repository.owner, repository.name)){ git =>
wiki.html.compare(Some(pageName), getWikiDiffs(git, commitId(0), commitId(1)), repository)
wiki.html.compare(Some(pageName), JGitUtil.getDiffs(git, commitId(0), commitId(1), true), repository)
}
})
@@ -67,7 +67,7 @@ trait WikiControllerBase extends ControllerBase {
val commitId = params("commitId").split("\\.\\.\\.")
JGitUtil.withGit(getWikiRepositoryDir(repository.owner, repository.name)){ git =>
wiki.html.compare(None, getWikiDiffs(git, commitId(0), commitId(1)), repository)
wiki.html.compare(None, JGitUtil.getDiffs(git, commitId(0), commitId(1), true), repository)
}
})