Browse code Merge branch 'master' into fork-and-pullreq Conflicts: src/main/scala/app/CreateRepositoryController.scala src/main/scala/util/JGitUtil.scala master
commit 4bd4c3e8330af6912311e111fb7d4d786a29add1 2 parents 47f082e + 1b878b5 takezoe authored on 26 Jul 2013

Showing 16 changed files

• src/main/resources/update/1_4.sql
• src/main/scala/ScalatraBootstrap.scala
• src/main/scala/app/ControllerBase.scala
• src/main/scala/app/CreateRepositoryController.scala
• src/main/scala/app/DashboardController.scala
• src/main/scala/model/Issue.scala
• src/main/scala/service/IssuesService.scala
• src/main/scala/service/RepositorySearchService.scala
• src/main/scala/service/WikiService.scala
• src/main/scala/util/JGitUtil.scala
• src/main/twirl/dashboard/issues.scala.html
• src/main/twirl/dashboard/tab.scala.html
• src/main/twirl/index.scala.html
• src/main/twirl/issues/list.scala.html
• src/main/twirl/issues/listparts.scala.html
• src/main/twirl/newrepo.scala.html

Ignore Space Show notes View src/main/resources/update/1_4.sql

Ignore Space Show notes View src/main/scala/ScalatraBootstrap.scala

Ignore Space Show notes View src/main/scala/app/ControllerBase.scala

Ignore Space Show notes View src/main/scala/app/CreateRepositoryController.scala

Ignore Space Show notes View src/main/scala/app/DashboardController.scala 0 → 100644

Ignore Space Show notes View src/main/scala/model/Issue.scala

Ignore Space Show notes View src/main/scala/service/IssuesService.scala

Ignore Space Show notes View src/main/scala/service/RepositorySearchService.scala

Ignore Space Show notes View src/main/scala/service/WikiService.scala

Ignore Space Show notes View src/main/scala/util/JGitUtil.scala

Ignore Space Show notes View src/main/twirl/dashboard/issues.scala.html 0 → 100644

Ignore Space Show notes View src/main/twirl/dashboard/tab.scala.html 0 → 100644

Ignore Space Show notes View src/main/twirl/index.scala.html

Ignore Space Show notes View src/main/twirl/issues/list.scala.html

Ignore Space Show notes View src/main/twirl/issues/listparts.scala.html 0 → 100644

Ignore Space Show notes View src/main/twirl/newrepo.scala.html

Show line notes below