Browse code Merge branch 'master' into add-features-to-ldapauth Conflicts: src/main/twirl/account/edit.scala.html master
commit 9175cf5c71eb77ca0ada84c08e514ceb2e4880a6 2 parents a74bbd3 + 8170a1b yjkony authored on 14 Mar 2014

Showing 43 changed files

• project/build.scala
• src/main/resources/update/1_12.sql
• src/main/scala/app/AccountController.scala
• src/main/scala/app/RepositoryViewerController.scala
• src/main/scala/app/SystemSettingsController.scala
• src/main/scala/app/WikiController.scala
• src/main/scala/model/SshKey.scala
• src/main/scala/service/RepositoryService.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/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/view/Markdown.scala
• src/main/twirl/account/edit.scala.html
• src/main/twirl/account/menu.scala.html
• src/main/twirl/account/register.scala.html
• src/main/twirl/account/ssh.scala.html
• src/main/twirl/admin/system.scala.html
• src/main/twirl/header.scala.html
• src/main/twirl/helper/copy.scala.html
• src/main/twirl/repo/blob.scala.html
• src/main/twirl/repo/branches.scala.html
• src/main/twirl/repo/commit.scala.html
• src/main/twirl/repo/commits.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/repo/tags.scala.html
• src/main/twirl/wiki/compare.scala.html
• src/main/twirl/wiki/edit.scala.html
• src/main/twirl/wiki/history.scala.html
• src/main/twirl/wiki/page.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/test/scala/ssh/GitCommandSpec.scala
• src/test/scala/view/AvatarImageProviderSpec.scala

Ignore Space Show notes View project/build.scala

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

Ignore Space Show notes View src/main/scala/app/AccountController.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/WikiController.scala

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

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

Ignore Space Show notes View src/main/twirl/account/edit.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/register.scala.html 0 → 100644

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/header.scala.html

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

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

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

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

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

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

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

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

Ignore Space Show notes View src/main/twirl/wiki/page.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/test/scala/ssh/GitCommandSpec.scala 0 → 100644

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

Show line notes below