Browse code Sync upstream/maste to master and Merge branch 'master' into add-features-to-ldapauth Conflicts: src/main/scala/app/IndexController.scala src/main/scala/service/SystemSettingsService.scala src/main/twirl/admin/system.scala.html master
commit 5e0619b5009c1eee48940745d0ca7f85c71b99de 2 parents 639e7e0 + 721454a yjkony authored on 3 Mar 2014

Showing 47 changed files

• README.md
• contrib/redhat/gitbucket.conf
• contrib/redhat/gitbucket.init
• etc/icons.svg
• src/main/java/JettyLauncher.java
• src/main/scala/app/AccountController.scala
• src/main/scala/app/ControllerBase.scala
• src/main/scala/app/FileUploadController.scala
• src/main/scala/app/IndexController.scala
• src/main/scala/app/IssuesController.scala
• src/main/scala/app/PullRequestsController.scala
• src/main/scala/app/RepositorySettingsController.scala
• src/main/scala/app/RepositoryViewerController.scala
• src/main/scala/app/SearchController.scala
• src/main/scala/app/SystemSettingsController.scala
• src/main/scala/app/WikiController.scala
• src/main/scala/service/AccountService.scala
• src/main/scala/service/IssuesService.scala
• src/main/scala/service/SystemSettingsService.scala
• src/main/scala/servlet/AutoUpdateListener.scala
• src/main/scala/servlet/GitRepositoryServlet.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/scala/view/Markdown.scala
• src/main/twirl/admin/system.scala.html
• src/main/twirl/header.scala.html
• src/main/twirl/index.scala.html
• src/main/twirl/issues/commentlist.scala.html
• src/main/twirl/main.scala.html
• src/main/twirl/newrepo.scala.html
• src/main/twirl/repo/files.scala.html
• src/main/webapp/assets/common/css/gitbucket.css
• src/main/webapp/assets/common/images/link.png
• src/main/webapp/assets/common/images/repo_fork.png
• src/main/webapp/assets/common/images/repo_fork_lg.png
• src/main/webapp/assets/common/images/repo_private.png
• src/main/webapp/assets/common/images/repo_private_lg.png
• src/main/webapp/assets/common/images/repo_public.png
• src/main/webapp/assets/common/images/repo_public_lg.png
• src/main/webapp/assets/common/js/gitbucket.js
• src/main/webapp/assets/jsdifflib/diffview.css
• src/test/scala/util/StringUtilSpec.scala
• src/test/scala/view/AvatarImageProviderSpec.scala
• src/test/scala/view/GitBucketHtmlSerializerSpec.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 etc/icons.svg

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

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

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

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/IssuesController.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/SearchController.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/service/AccountService.scala

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Ignore Space Show notes View src/main/webapp/assets/common/images/repo_public_lg.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

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

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

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

Show line notes below