Browse Source

Use identicon image for default gravatar. (#2767)

* Use identicon image for default gravatar.

* Fixed tests.
tags/v1.3.0-rc1
harry Bo-Yi Wu 8 years ago
parent
commit
85a58ee26b
3 changed files with 4 additions and 4 deletions
  1. +2
    -2
      models/action_test.go
  2. +1
    -1
      modules/base/tool.go
  3. +1
    -1
      modules/base/tool_test.go

+ 2
- 2
models/action_test.go View File

@@ -146,11 +146,11 @@ func TestPushCommits_AvatarLink(t *testing.T) {
pushCommits.Len = len(pushCommits.Commits)

assert.Equal(t,
"https://secure.gravatar.com/avatar/ab53a2911ddf9b4817ac01ddcd3d975f",
"https://secure.gravatar.com/avatar/ab53a2911ddf9b4817ac01ddcd3d975f?d=identicon",
pushCommits.AvatarLink("user2@example.com"))

assert.Equal(t,
"https://secure.gravatar.com/avatar/19ade630b94e1e0535b3df7387434154",
"https://secure.gravatar.com/avatar/19ade630b94e1e0535b3df7387434154?d=identicon",
pushCommits.AvatarLink("nonexistent@example.com"))
}



+ 1
- 1
modules/base/tool.go View File

@@ -211,7 +211,7 @@ func AvatarLink(email string) string {
}

if !setting.DisableGravatar {
return setting.GravatarSource + HashEmail(email)
return setting.GravatarSource + HashEmail(email) + "?d=identicon"
}

return DefaultAvatarLink()


+ 1
- 1
modules/base/tool_test.go View File

@@ -135,7 +135,7 @@ func TestAvatarLink(t *testing.T) {

setting.DisableGravatar = false
assert.Equal(t,
"353cbad9b58e69c96154ad99f92bedc7",
"353cbad9b58e69c96154ad99f92bedc7?d=identicon",
AvatarLink("gitea@example.com"),
)
}


Loading…
Cancel
Save