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

Merge branch 'master' into fork-and-pullreq

Browse Source 
Conflicts:
	src/main/resources/update/1_3.sql
	src/main/resources/update/1_4.sql
	src/main/scala/app/CreateRepositoryController.scala
	src/main/scala/service/WikiService.scala
	src/main/twirl/account/repositories.scala.html
This commit is contained in:
takezoe
2013-07-24 13:29:23 +09:00
parent 2c52a4c40c 3a7391fbb3
commit f10f98abf2
82 changed files with 1693 additions and 547 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/scala/ScalatraBootstrap.scala
View File

@@ -5,6 +5,7 @@ import javax.servlet._
class ScalatraBootstrap extends LifeCycle {
override def init(context: ServletContext) {
context.mount(new IndexController, "/")
context.mount(new SearchController, "/")
context.mount(new FileUploadController, "/upload")
context.mount(new SignInController, "/*")
context.mount(new UserManagementController, "/*")