Merge remote-tracking branch 'upstream/master' into pr-handle-errors

Fork: 0

johnpearcey / gitbucket_jkp

Browse code Merge remote-tracking branch 'upstream/master' into pr-handle-errors # Conflicts: # src/main/scala/gitbucket/core/controller/SystemSettingsController.scala # src/main/scala/gitbucket/core/service/SystemSettingsService.scala # src/test/scala/gitbucket/core/view/AvatarImageProviderSpec.scala master
commit e77045abe3c0c92acc8b065af37b573a58c70104 2 parents 040d812 + 8893a4a KOUNOIKE Yuusuke authored on 20 Aug 2017

Browse code

# Conflicts:
#	src/main/scala/gitbucket/core/controller/SystemSettingsController.scala
#	src/main/scala/gitbucket/core/service/SystemSettingsService.scala
#	src/test/scala/gitbucket/core/view/AvatarImageProviderSpec.scala

master

commit e77045abe3c0c92acc8b065af37b573a58c70104

2 parents 040d812 + 8893a4a

KOUNOIKE Yuusuke authored on 20 Aug 2017

Patch

Unified Split

Showing 7 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/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