Merge branch 'master' into github-compat-url

Fork: 0

Gatewify / GitBucket

Browse code Merge branch 'master' into github-compat-url patch-3 test 4.31.2 4.31.1 4.31.0 4.30.1 4.30.0 4.29.0 4.28.0 4.27.0 4.26.0 4.25.0 4.24.1 4.24.0 4.23.1 4.23.0 4.22.0 4.21.2 4.21.1 4.21.0 4.20.0 4.19.3 4.19.2 4.19.1 4.19.0 4.18.0 4.17.0 4.16.0 1.0.0
commit d73ddbdbcb7a7efe18e508ab48727b0149ac2814 2 parents e208dd5 + 8893a4a Naoki Takezoe authored on 20 Aug 2017 GitHub committed on 20 Aug 2017

Patch

Unified Split

Showing 6 changed files

Ignore Space Show notes View .travis.yml

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

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

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

Show line notes below