Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-11-07 05:55:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
# 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
This commit is contained in:
KOUNOIKE Yuusuke
2017-08-20 21:50:34 +09:00
parent 040d812f2a 8893a4a456
commit e77045abe3
7 changed files with 49 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/test/scala/gitbucket/core/view/AvatarImageProviderSpec.scala
View File

@@ -119,7 +119,9 @@ class AvatarImageProviderSpec extends FunSpec with MockitoSugar {
smtp = None,
ldapAuthentication = false,
ldap = None,
debug = false)
skinName = "skin-blue",
debug = false
)
/**
* Adapter to test AvatarImageProviderImpl.