OSDN Git Service
(root)
/
wvm
/
gitlab.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
26befdc
)
Override gravatar url to use SSL if gitlab has the SSL flag set to true.
author
Sylas
<sylas@debian>
Thu, 18 Apr 2013 04:34:08 +0000
(21:34 -0700)
committer
Sylas
<sylas@debian>
Thu, 18 Apr 2013 04:34:08 +0000
(21:34 -0700)
app/helpers/application_helper.rb
patch
|
blob
|
history
diff --git
a/app/helpers/application_helper.rb
b/app/helpers/application_helper.rb
index
387172b
..
61eb827
100644
(file)
--- a/
app/helpers/application_helper.rb
+++ b/
app/helpers/application_helper.rb
@@
-37,7
+37,7
@@
module ApplicationHelper
if !Gitlab.config.gravatar.enabled || user_email.blank?
'no_avatar.png'
else
- gravatar_url = request.ssl? ? Gitlab.config.gravatar.ssl_url : Gitlab.config.gravatar.plain_url
+ gravatar_url = request.ssl?
|| Gitlab.config.gitlab.https
? Gitlab.config.gravatar.ssl_url : Gitlab.config.gravatar.plain_url
user_email.strip!
sprintf gravatar_url, hash: Digest::MD5.hexdigest(user_email.downcase), size: size
end