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

Merge branch '#3_repository-search'

Browse Source 
Conflicts:
	src/main/scala/app/UserManagementController.scala
	src/main/scala/service/IssuesService.scala
	src/main/twirl/issues/issue.scala.html
This commit is contained in:
takezoe
2013-07-20 03:00:16 +09:00
parent 0c131ec990 54280d5572
commit 91d94de1d2
36 changed files with 411 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/scala/service/WikiService.scala
View File

@@ -6,7 +6,6 @@ import org.eclipse.jgit.api.Git
import org.apache.commons.io.FileUtils
import util.JGitUtil.DiffInfo
import util.{Directory, JGitUtil}
import org.eclipse.jgit.lib.RepositoryBuilder
import org.eclipse.jgit.treewalk.CanonicalTreeParser
import java.util.concurrent.ConcurrentHashMap