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-editorconfig-for-repository

Browse Source
This commit is contained in:
KOUNOIKE Yuusuke
2018-07-01 12:04:38 +09:00
parent 58381c3d30 f01c65d022
commit fd6b658565
112 changed files with 2455 additions and 1464 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/test/scala/gitbucket/core/api/JsonFormatSpec.scala
View File

@@ -345,7 +345,7 @@ class JsonFormatSpec extends FunSuite {
commit_id = "0d1a26e67d8f5eaf1f6ba5c57fc3c7d91ac0fd1c",
// "original_commit_id": "0d1a26e67d8f5eaf1f6ba5c57fc3c7d91ac0fd1c",
user = apiUser,
body = "Maybe you should use more emojji on this line.",
body = "Maybe you should use more emoji on this line.",
created_at = date("2015-05-05T23:40:27Z"),
updated_at = date("2015-05-05T23:40:27Z")
)(RepositoryName("baxterthehacker/public-repo"), 1)
@@ -359,7 +359,7 @@ class JsonFormatSpec extends FunSuite {
"commit_id": "0d1a26e67d8f5eaf1f6ba5c57fc3c7d91ac0fd1c",
// "original_commit_id": "0d1a26e67d8f5eaf1f6ba5c57fc3c7d91ac0fd1c",
"user": $apiUserJson,
"body": "Maybe you should use more emojji on this line.",
"body": "Maybe you should use more emoji on this line.",
"created_at": "2015-05-05T23:40:27Z",
"updated_at": "2015-05-05T23:40:27Z",
"html_url": "http://gitbucket.exmple.com/baxterthehacker/public-repo/pull/1#discussion_r29724692",

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

@@ -7,7 +7,7 @@ import javax.servlet.http.{HttpServletRequest, HttpSession}
import gitbucket.core.controller.Context
import gitbucket.core.model.Account
import gitbucket.core.service.RequestCache
import gitbucket.core.service.SystemSettingsService.SystemSettings
import gitbucket.core.service.SystemSettingsService.{Ssh, SystemSettings}
import org.mockito.Mockito._
import org.scalatest.FunSpec
import org.scalatest.mockito.MockitoSugar
@@ -125,16 +125,20 @@ class AvatarImageProviderSpec extends FunSpec with MockitoSugar {
gravatar = useGravatar,
notification = false,
activityLogLimit = None,
ssh = false,
sshHost = None,
sshPort = None,
ssh = Ssh(
enabled = false,
sshHost = None,
sshPort = None
),
useSMTP = false,
smtp = None,
ldapAuthentication = false,
ldap = None,
oidcAuthentication = false,
oidc = None,
skinName = "skin-blue"
skinName = "skin-blue",
showMailAddress = false,
pluginNetworkInstall = false
)
/**