Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
312e3b1e
G
gitlab-foss
项目概览
李少辉-开发者
/
gitlab-foss
通知
15
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
gitlab-foss
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
312e3b1e
编写于
11月 26, 2015
作者:
S
Stan Hu
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'master' of
https://github.com/gitlabhq/gitlabhq
上级
68a45338
2f90e71f
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
18 addition
and
14 deletion
+18
-14
app/helpers/application_helper.rb
app/helpers/application_helper.rb
+4
-4
app/models/user.rb
app/models/user.rb
+2
-2
app/services/gravatar_service.rb
app/services/gravatar_service.rb
+2
-2
spec/helpers/application_helper_spec.rb
spec/helpers/application_helper_spec.rb
+10
-6
未找到文件。
app/helpers/application_helper.rb
浏览文件 @
312e3b1e
...
...
@@ -68,7 +68,7 @@ module ApplicationHelper
end
end
def
avatar_icon
(
user_or_email
=
nil
,
size
=
nil
)
def
avatar_icon
(
user_or_email
=
nil
,
size
=
nil
,
scale
=
2
)
if
user_or_email
.
is_a?
(
User
)
user
=
user_or_email
else
...
...
@@ -78,12 +78,12 @@ module ApplicationHelper
if
user
user
.
avatar_url
(
size
)
||
default_avatar
else
gravatar_icon
(
user_or_email
,
size
)
gravatar_icon
(
user_or_email
,
size
,
scale
)
end
end
def
gravatar_icon
(
user_email
=
''
,
size
=
nil
)
GravatarService
.
new
.
execute
(
user_email
,
size
)
||
def
gravatar_icon
(
user_email
=
''
,
size
=
nil
,
scale
=
2
)
GravatarService
.
new
.
execute
(
user_email
,
size
,
scale
)
||
default_avatar
end
...
...
app/models/user.rb
浏览文件 @
312e3b1e
...
...
@@ -637,11 +637,11 @@ class User < ActiveRecord::Base
email
.
start_with?
(
'temp-email-for-oauth'
)
end
def
avatar_url
(
size
=
nil
)
def
avatar_url
(
size
=
nil
,
scale
=
2
)
if
avatar
.
present?
[
gitlab_config
.
url
,
avatar
.
url
].
join
else
GravatarService
.
new
.
execute
(
email
,
size
)
GravatarService
.
new
.
execute
(
email
,
size
,
scale
)
end
end
...
...
app/services/gravatar_service.rb
浏览文件 @
312e3b1e
class
GravatarService
include
Gitlab
::
CurrentSettings
def
execute
(
email
,
size
=
nil
)
def
execute
(
email
,
size
=
nil
,
scale
=
2
)
if
current_application_settings
.
gravatar_enabled?
&&
email
.
present?
size
=
40
if
size
.
nil?
||
size
<=
0
sprintf
gravatar_url
,
hash:
Digest
::
MD5
.
hexdigest
(
email
.
strip
.
downcase
),
size:
size
,
size:
size
*
scale
,
email:
email
.
strip
end
end
...
...
spec/helpers/application_helper_spec.rb
浏览文件 @
312e3b1e
...
...
@@ -95,9 +95,9 @@ describe ApplicationHelper do
end
it
'should call gravatar_icon when no User exists with the given email'
do
expect
(
helper
).
to
receive
(
:gravatar_icon
).
with
(
'foo@example.com'
,
20
)
expect
(
helper
).
to
receive
(
:gravatar_icon
).
with
(
'foo@example.com'
,
20
,
2
)
helper
.
avatar_icon
(
'foo@example.com'
,
20
)
helper
.
avatar_icon
(
'foo@example.com'
,
20
,
2
)
end
describe
'using a User'
do
...
...
@@ -150,15 +150,19 @@ describe ApplicationHelper do
stub_gravatar_setting
(
plain_url:
'http://example.local/?s=%{size}&hash=%{hash}'
)
expect
(
gravatar_icon
(
user_email
,
20
)).
to
eq
(
'http://example.local/?s=
2
0&hash=b58c6f14d292556214bd64909bcdb118'
)
to
eq
(
'http://example.local/?s=
4
0&hash=b58c6f14d292556214bd64909bcdb118'
)
end
it
'accepts a custom size argument'
do
expect
(
helper
.
gravatar_icon
(
user_email
,
64
)).
to
include
'?s=
64
'
expect
(
helper
.
gravatar_icon
(
user_email
,
64
)).
to
include
'?s=
128
'
end
it
'defaults size to 40 when given an invalid size'
do
expect
(
helper
.
gravatar_icon
(
user_email
,
nil
)).
to
include
'?s=40'
it
'defaults size to 40@2x when given an invalid size'
do
expect
(
helper
.
gravatar_icon
(
user_email
,
nil
)).
to
include
'?s=80'
end
it
'accepts a scaling factor'
do
expect
(
helper
.
gravatar_icon
(
user_email
,
40
,
3
)).
to
include
'?s=120'
end
it
'ignores case and surrounding whitespace'
do
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录