Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
bf941ce9
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,发现更多精彩内容 >>
提交
bf941ce9
编写于
6月 11, 2014
作者:
D
Dmitriy Zaporozhets
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #7012 from MrMarvin/issue_229_no_avatar_png_path_in_coffee
fixes gitlab.com issue #229 - github.com issue #6976
上级
1f5891e9
58750239
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
5 addition
and
5 deletion
+5
-5
app/assets/javascripts/project_users_select.js.coffee
app/assets/javascripts/project_users_select.js.coffee
+1
-1
app/assets/javascripts/users_select.js.coffee
app/assets/javascripts/users_select.js.coffee
+1
-1
app/helpers/application_helper.rb
app/helpers/application_helper.rb
+1
-1
spec/helpers/application_helper_spec.rb
spec/helpers/application_helper_spec.rb
+2
-2
未找到文件。
app/assets/javascripts/project_users_select.js.coffee
浏览文件 @
bf941ce9
...
@@ -43,7 +43,7 @@
...
@@ -43,7 +43,7 @@
avatar
=
avatar
.
replace
(
'%{hash}'
,
md5
(
user
.
email
))
avatar
=
avatar
.
replace
(
'%{hash}'
,
md5
(
user
.
email
))
avatar
=
avatar
.
replace
(
'%{size}'
,
'24'
)
avatar
=
avatar
.
replace
(
'%{size}'
,
'24'
)
else
else
avatar
=
gon
.
relative_url_root
+
"
/assets/no_avatar.png
"
avatar
=
gon
.
relative_url_root
+
"
#{
image_path
(
'no_avatar.png'
)
}
"
if
user
.
id
==
''
if
user
.
id
==
''
avatarMarkup
=
''
avatarMarkup
=
''
...
...
app/assets/javascripts/users_select.js.coffee
浏览文件 @
bf941ce9
...
@@ -7,7 +7,7 @@ $ ->
...
@@ -7,7 +7,7 @@ $ ->
avatar
=
avatar
.
replace
(
'%{hash}'
,
md5
(
user
.
email
))
avatar
=
avatar
.
replace
(
'%{hash}'
,
md5
(
user
.
email
))
avatar
=
avatar
.
replace
(
'%{size}'
,
'24'
)
avatar
=
avatar
.
replace
(
'%{size}'
,
'24'
)
else
else
avatar
=
gon
.
relative_url_root
+
"
/assets/no_avatar.png
"
avatar
=
gon
.
relative_url_root
+
"
#{
image_path
(
'no_avatar.png'
)
}
"
"<div class='user-result'>
"<div class='user-result'>
<div class='user-image'><img class='avatar s24' src='
#{
avatar
}
'></div>
<div class='user-image'><img class='avatar s24' src='
#{
avatar
}
'></div>
...
...
app/helpers/application_helper.rb
浏览文件 @
bf941ce9
...
@@ -71,7 +71,7 @@ module ApplicationHelper
...
@@ -71,7 +71,7 @@ module ApplicationHelper
size
=
40
if
size
.
nil?
||
size
<=
0
size
=
40
if
size
.
nil?
||
size
<=
0
if
!
Gitlab
.
config
.
gravatar
.
enabled
||
user_email
.
blank?
if
!
Gitlab
.
config
.
gravatar
.
enabled
||
user_email
.
blank?
'/assets/no_avatar.png'
image_path
(
'no_avatar.png'
)
else
else
gravatar_url
=
request
.
ssl?
||
gitlab_config
.
https
?
Gitlab
.
config
.
gravatar
.
ssl_url
:
Gitlab
.
config
.
gravatar
.
plain_url
gravatar_url
=
request
.
ssl?
||
gitlab_config
.
https
?
Gitlab
.
config
.
gravatar
.
ssl_url
:
Gitlab
.
config
.
gravatar
.
plain_url
user_email
.
strip!
user_email
.
strip!
...
...
spec/helpers/application_helper_spec.rb
浏览文件 @
bf941ce9
...
@@ -79,11 +79,11 @@ describe ApplicationHelper do
...
@@ -79,11 +79,11 @@ describe ApplicationHelper do
it
"should return a generic avatar path when Gravatar is disabled"
do
it
"should return a generic avatar path when Gravatar is disabled"
do
Gitlab
.
config
.
gravatar
.
stub
(
:enabled
).
and_return
(
false
)
Gitlab
.
config
.
gravatar
.
stub
(
:enabled
).
and_return
(
false
)
gravatar_icon
(
user_email
).
should
==
'/assets/no_avatar.png'
gravatar_icon
(
user_email
).
should
match
(
'no_avatar.png'
)
end
end
it
"should return a generic avatar path when email is blank"
do
it
"should return a generic avatar path when email is blank"
do
gravatar_icon
(
''
).
should
==
'/assets/no_avatar.png'
gravatar_icon
(
''
).
should
match
(
'no_avatar.png'
)
end
end
it
"should return default gravatar url"
do
it
"should return default gravatar url"
do
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录