Browse code Merge branch 'master' into feature/get-single-commit-api # Conflicts: # src/main/scala/gitbucket/core/controller/ApiController.scala master
commit 1f37362da4174ebdbb053b97b2009285ad049c29 2 parents efdfe2b + 1dba28d Naoki Takezoe authored on 5 Sep 2017

Showing 26 changed files

• .travis.yml
• README.md
• build.sbt
• plugins.json
• src/main/scala/ScalatraBootstrap.scala
• src/main/scala/gitbucket/core/GitBucketCoreModule.scala
• src/main/scala/gitbucket/core/controller/AnonymousAccessController.scala
• src/main/scala/gitbucket/core/controller/ApiController.scala
• src/main/scala/gitbucket/core/controller/ControllerBase.scala
• src/main/scala/gitbucket/core/controller/PreProcessController.scala
• src/main/scala/gitbucket/core/controller/PullRequestsController.scala
• src/main/scala/gitbucket/core/controller/RepositoryViewerController.scala
• src/main/scala/gitbucket/core/controller/SystemSettingsController.scala
• src/main/scala/gitbucket/core/plugin/PluginRegistory.scala
• src/main/scala/gitbucket/core/service/IssuesService.scala
• src/main/scala/gitbucket/core/service/SystemSettingsService.scala
• src/main/scala/gitbucket/core/service/WebHookService.scala
• src/main/scala/gitbucket/core/servlet/GHCompatRepositoryAccessFilter.scala
• src/main/scala/gitbucket/core/servlet/PluginControllerFilter.scala
• src/main/scala/gitbucket/core/ssh/GitCommand.scala
• src/main/scala/gitbucket/core/util/Notifier.scala
• src/main/twirl/gitbucket/core/admin/system.scala.html
• src/main/twirl/gitbucket/core/error.scala.html
• src/main/twirl/gitbucket/core/main.scala.html
• src/main/twirl/gitbucket/core/repo/commits.scala.html
• src/test/scala/gitbucket/core/view/AvatarImageProviderSpec.scala

Ignore Space Show notes View .travis.yml

Ignore Space Show notes View README.md

Ignore Space Show notes View build.sbt

Ignore Space Show notes View plugins.json

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

Ignore Space Show notes View src/main/scala/gitbucket/core/GitBucketCoreModule.scala

Show notes View src/main/scala/gitbucket/core/controller/AnonymousAccessController.scala 100644 → 0

Ignore Space Show notes View src/main/scala/gitbucket/core/controller/ApiController.scala

Ignore Space Show notes View src/main/scala/gitbucket/core/controller/ControllerBase.scala

Ignore Space Show notes View src/main/scala/gitbucket/core/controller/PreProcessController.scala 0 → 100644

Ignore Space Show notes View src/main/scala/gitbucket/core/controller/PullRequestsController.scala

Ignore Space Show notes View src/main/scala/gitbucket/core/controller/RepositoryViewerController.scala

Ignore Space Show notes View src/main/scala/gitbucket/core/controller/SystemSettingsController.scala

Ignore Space Show notes View src/main/scala/gitbucket/core/plugin/PluginRegistory.scala

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

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

Ignore Space Show notes View src/main/scala/gitbucket/core/service/WebHookService.scala

Show notes View src/main/scala/gitbucket/core/servlet/GHCompatRepositoryAccessFilter.scala 100644 → 0

Ignore Space Show notes View src/main/scala/gitbucket/core/servlet/PluginControllerFilter.scala

Ignore Space Show notes View src/main/scala/gitbucket/core/ssh/GitCommand.scala

Ignore Space Show notes View src/main/scala/gitbucket/core/util/Notifier.scala

Ignore Space Show notes View src/main/twirl/gitbucket/core/admin/system.scala.html

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

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

Ignore Space Show notes View src/main/twirl/gitbucket/core/repo/commits.scala.html

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

Show line notes below