Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Privacy
Imprint
Contact
Login methods
Sign in
Toggle navigation
Menu
Open sidebar
projects.thm.de
GitLab
Commits
6e47fbf5
Commit
6e47fbf5
authored
Feb 11, 2014
by
Dmitriy Zaporozhets
Browse files
Merge branch 'bug/gravatr_select2' into 'master'
Dont use gravatars for user select if gravatar is disabled Fixes #836
parents
39aeac71
348e44ef
Changes
2
Hide whitespace changes
Inline
Side-by-side
app/assets/javascripts/users_select.js.coffee
View file @
6e47fbf5
...
...
@@ -2,10 +2,12 @@ $ ->
userFormatResult
=
(
user
)
->
if
user
.
avatar
avatar
=
user
.
avatar
.
url
else
else
if
gon
.
gravatar_enabled
avatar
=
gon
.
gravatar_url
avatar
=
avatar
.
replace
(
'%{hash}'
,
md5
(
user
.
email
))
avatar
=
avatar
.
replace
(
'%{size}'
,
'24'
)
else
avatar
=
gon
.
relative_url_root
+
"/assets/no_avatar.png"
"<div class='user-result'>
<div class='user-image'><img class='avatar s24' src='
#{
avatar
}
'></div>
...
...
app/controllers/application_controller.rb
View file @
6e47fbf5
...
...
@@ -171,6 +171,7 @@ def add_gon_variables
gon
.
api_token
=
current_user
.
private_token
if
current_user
gon
.
gravatar_url
=
request
.
ssl?
||
Gitlab
.
config
.
gitlab
.
https
?
Gitlab
.
config
.
gravatar
.
ssl_url
:
Gitlab
.
config
.
gravatar
.
plain_url
gon
.
relative_url_root
=
Gitlab
.
config
.
gitlab
.
relative_url_root
gon
.
gravatar_enabled
=
Gitlab
.
config
.
gravatar
.
enabled
end
def
check_password_expiration
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment