Browse code Merge branch 'master' into ssh-access Conflicts: src/main/scala/servlet/GitRepositoryServlet.scala master
commit 049b12b9089a5a7e8f9858bb845b41760a7dd065 2 parents 45f992b + 2d0f59b takezoe authored on 8 Mar 2014

Showing 50 changed files

• README.md
• contrib/redhat/gitbucket.conf
• contrib/redhat/gitbucket.init
• sbt.bat
• sbt.sh
• src/main/java/JettyLauncher.java
• src/main/resources/update/1_12.sql
• src/main/scala/ScalatraBootstrap.scala
• src/main/scala/app/AccountController.scala
• src/main/scala/app/ControllerBase.scala
• src/main/scala/app/CreateRepositoryController.scala
• src/main/scala/app/FileUploadController.scala
• src/main/scala/app/IndexController.scala
• src/main/scala/app/PullRequestsController.scala
• src/main/scala/app/RepositorySettingsController.scala
• src/main/scala/app/RepositoryViewerController.scala
• src/main/scala/app/SystemSettingsController.scala
• src/main/scala/app/UserManagementController.scala
• src/main/scala/app/WikiController.scala
• src/main/scala/model/GroupMembers.scala
• src/main/scala/service/AccountService.scala
• src/main/scala/service/IssuesService.scala
• src/main/scala/service/RepositorySearchService.scala
• src/main/scala/service/RepositoryService.scala
• src/main/scala/service/SystemSettingsService.scala
• src/main/scala/service/WikiService.scala
• src/main/scala/servlet/AutoUpdateListener.scala
• src/main/scala/servlet/GitRepositoryServlet.scala
• src/main/scala/util/Authenticator.scala
• src/main/scala/util/ControlUtil.scala
• src/main/scala/util/Implicits.scala
• src/main/scala/util/JGitUtil.scala
• src/main/scala/util/Keys.scala
• src/main/scala/util/StringUtil.scala
• src/main/twirl/account/group.scala.html
• src/main/twirl/account/main.scala.html
• src/main/twirl/account/members.scala.html
• src/main/twirl/account/newrepo.scala.html
• src/main/twirl/account/repositories.scala.html
• src/main/twirl/admin/users/group.scala.html
• src/main/twirl/header.scala.html
• src/main/twirl/main.scala.html
• src/main/twirl/newrepo.scala.html
• src/main/twirl/repo/branches.scala.html
• src/main/twirl/repo/files.scala.html
• src/main/twirl/settings/collaborators.scala.html
• src/main/webapp/assets/common/images/folder_link.png
• src/test/scala/service/AccountServiceServiceSpec.scala
• src/test/scala/service/AccountServiceSpec.scala
• src/test/scala/util/StringUtilSpec.scala

Ignore Space Show notes View README.md

Ignore Space Show notes View contrib/redhat/gitbucket.conf

Ignore Space Show notes View contrib/redhat/gitbucket.init

Ignore Space Show notes View sbt.bat

Ignore Space Show notes View sbt.sh

Ignore Space Show notes View src/main/java/JettyLauncher.java

Ignore Space Show notes View src/main/resources/update/1_12.sql 0 → 100644

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

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

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

Show notes View src/main/scala/app/CreateRepositoryController.scala 100644 → 0

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

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

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

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

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

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

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

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

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

Ignore Space Show notes View src/main/scala/service/AccountService.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/RepositoryService.scala

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

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

Ignore Space Show notes View src/main/scala/servlet/AutoUpdateListener.scala

Ignore Space Show notes View src/main/scala/servlet/GitRepositoryServlet.scala

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

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

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

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

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

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

Ignore Space Show notes View src/main/twirl/account/group.scala.html 0 → 100644

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

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

Ignore Space Show notes View src/main/twirl/account/newrepo.scala.html 0 → 100644

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

Ignore Space Show notes View src/main/twirl/admin/users/group.scala.html

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

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

Show notes View src/main/twirl/newrepo.scala.html 100644 → 0

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

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

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

Ignore Space Show notes View src/main/webapp/assets/common/images/folder_link.png 0 → 100644

Show notes View src/test/scala/service/AccountServiceServiceSpec.scala 100644 → 0

Ignore Space Show notes View src/test/scala/service/AccountServiceSpec.scala 0 → 100644

Ignore Space Show notes View src/test/scala/util/StringUtilSpec.scala

Show line notes below