Merge branch 'master' into fork-and-pullreq
Conflicts:
	src/main/scala/app/RepositoryViewerController.scala
	src/main/scala/service/RepositoryService.scala
commit e52aa7ad3c176f1c9bcd9893f857a2c361ae8475
2 parents 7a89587 + 42faf9b
@takezoe takezoe authored on 3 Aug 2013
Showing 20 changed files
View
README.md
View
gitbucket.erd
View
project/plugins.sbt
View
src/main/scala/app/AccountController.scala
View
src/main/scala/app/DashboardController.scala
View
src/main/scala/app/IndexController.scala
View
src/main/scala/app/IssuesController.scala
View
src/main/scala/app/RepositoryViewerController.scala
View
src/main/scala/app/SearchController.scala
View
src/main/scala/service/IssuesService.scala
View
src/main/scala/service/RepositoryService.scala
View
src/main/scala/util/JGitUtil.scala
View
src/main/scala/view/AvatarImageProvider.scala
View
src/main/twirl/dashboard/issues.scala.html
View
src/main/twirl/dashboard/tab.scala.html
View
src/main/twirl/index.scala.html
View
src/main/twirl/issues/listparts.scala.html
View
src/main/twirl/repo/tab.scala.html
View
src/main/twirl/settings/options.scala.html
View
src/main/webapp/WEB-INF/web.xml