Browse code Merge branch 'master' into asciidoctorj Conflicts: src/main/scala/app/RepositoryViewerController.scala master
commit c9a1515d1f2ba59b05854dac5b73883a733d1643 2 parents 10a40bf + 5317ac5 Tobias Roeser authored on 29 Mar 2014

Showing 75 changed files

• README.md
• project/build.properties
• project/build.scala
• project/plugins.sbt
• sbt-launch-0.12.3.jar
• sbt-launch-0.13.1.jar
• sbt.bat
• sbt.sh
• 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/IndexController.scala
• src/main/scala/app/PullRequestsController.scala
• src/main/scala/app/RepositoryViewerController.scala
• src/main/scala/app/SystemSettingsController.scala
• src/main/scala/app/UserManagementController.scala
• src/main/scala/model/GroupMembers.scala
• src/main/scala/model/SshKey.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/RequestCache.scala
• src/main/scala/service/SshKeyService.scala
• src/main/scala/service/SystemSettingsService.scala
• src/main/scala/service/WebHookService.scala
• src/main/scala/service/WikiService.scala
• src/main/scala/servlet/AutoUpdateListener.scala
• src/main/scala/servlet/GitRepositoryServlet.scala
• src/main/scala/ssh/GitCommand.scala
• src/main/scala/ssh/NoShell.scala
• src/main/scala/ssh/PublicKeyAuthenticator.scala
• src/main/scala/ssh/SshServerListener.scala
• src/main/scala/ssh/SshUtil.scala
• src/main/scala/util/Authenticator.scala
• src/main/scala/util/JGitUtil.scala
• src/main/scala/view/AvatarImageProvider.scala
• src/main/scala/view/Markdown.scala
• src/main/twirl/account/edit.scala.html
• 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/menu.scala.html
• src/main/twirl/account/newrepo.scala.html
• src/main/twirl/account/register.scala.html
• src/main/twirl/account/repositories.scala.html
• src/main/twirl/account/ssh.scala.html
• src/main/twirl/admin/system.scala.html
• src/main/twirl/admin/users/group.scala.html
• src/main/twirl/header.scala.html
• src/main/twirl/helper/copy.scala.html
• src/main/twirl/index.scala.html
• src/main/twirl/issues/create.scala.html
• src/main/twirl/issues/issuedetail.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/repo/guide.scala.html
• src/main/twirl/repo/tab.scala.html
• src/main/twirl/settings/collaborators.scala.html
• src/main/twirl/signin.scala.html
• src/main/twirl/wiki/pages.scala.html
• src/main/twirl/wiki/tab.scala.html
• src/main/webapp/WEB-INF/web.xml
• src/main/webapp/assets/common/css/gitbucket.css
• src/main/webapp/assets/common/images/folder_link.png
• src/main/webapp/assets/common/js/gitbucket.js
• src/main/webapp/assets/jsdifflib/diffview.css
• src/test/scala/service/AccountServiceServiceSpec.scala
• src/test/scala/service/AccountServiceSpec.scala
• src/test/scala/ssh/GitCommandSpec.scala
• src/test/scala/view/AvatarImageProviderSpec.scala

Ignore Space Show notes View README.md

Ignore Space Show notes View project/build.properties

Ignore Space Show notes View project/build.scala

Ignore Space Show notes View project/plugins.sbt

Show notes View sbt-launch-0.12.3.jar 100644 → 0
Not supported

Ignore Space Show notes View sbt-launch-0.13.1.jar 0 → 100644
Not supported

Ignore Space Show notes View sbt.bat

Ignore Space Show notes View sbt.sh

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/IndexController.scala

Ignore Space Show notes View src/main/scala/app/PullRequestsController.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/model/GroupMembers.scala

Ignore Space Show notes View src/main/scala/model/SshKey.scala 0 → 100644

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/RequestCache.scala

Ignore Space Show notes View src/main/scala/service/SshKeyService.scala 0 → 100644

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

Ignore Space Show notes View src/main/scala/service/WebHookService.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/ssh/GitCommand.scala 0 → 100644

Ignore Space Show notes View src/main/scala/ssh/NoShell.scala 0 → 100644

Ignore Space Show notes View src/main/scala/ssh/PublicKeyAuthenticator.scala 0 → 100644

Ignore Space Show notes View src/main/scala/ssh/SshServerListener.scala 0 → 100644

Ignore Space Show notes View src/main/scala/ssh/SshUtil.scala 0 → 100644

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

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

Ignore Space Show notes View src/main/scala/view/AvatarImageProvider.scala

Ignore Space Show notes View src/main/scala/view/Markdown.scala

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

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/menu.scala.html 0 → 100644

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

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

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

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

Ignore Space Show notes View src/main/twirl/admin/system.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/helper/copy.scala.html

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

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

Ignore Space Show notes View src/main/twirl/issues/issuedetail.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/repo/guide.scala.html

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

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

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

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

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

Ignore Space Show notes View src/main/webapp/WEB-INF/web.xml

Ignore Space Show notes View src/main/webapp/assets/common/css/gitbucket.css

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

Ignore Space Show notes View src/main/webapp/assets/common/js/gitbucket.js

Ignore Space Show notes View src/main/webapp/assets/jsdifflib/diffview.css

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/ssh/GitCommandSpec.scala 0 → 100644

Ignore Space Show notes View src/test/scala/view/AvatarImageProviderSpec.scala

Show line notes below