Skip to content
Snippets Groups Projects
Commit 7b6cbeba authored by Cyril's avatar Cyril
Browse files

fix #2492

parent 9cf99397
No related branches found
No related tags found
2 merge requests!104094 0 stable,!2652fix #2492
This commit is part of merge request !10409. Comments created here will be created in the context of that merge request.
Hide whitespace changes
Inline Side-by-side
config/initializers/1_settings.rb
+ 1
− 1
Edit View file @ 7b6cbeba
@@ -324,7 +324,7 @@ Settings.gitlab['email_from'] ||= Settings.pre_40_config ? Settings.email_from :
Settings.gitlab['url'] ||= Settings.pre_40_config ? Settings.url : Settings.send(:build_gitlab_url)
 
Settings['gravatar'] ||= Settingslogic.new({})
Settings.gravatar['enabled'] ||= Settings.pre_40_config ? !Settings.disable_gravatar? : true
Settings.gravatar['enabled'] = Settings.pre_40_config ? !Settings.disable_gravatar? : true if Settings.gravatar['enabled'].nil?
Settings.gravatar['plain_url'] ||= Settings.pre_40_config ? Settings.gravatar_url : 'http://www.gravatar.com/avatar/%{hash}?s=%{size}&d=mm'
Settings.gravatar['ssl_url'] ||= Settings.pre_40_config ? Settings.gravatar_ssl_url : 'https://secure.gravatar.com/avatar/%{hash}?s=%{size}&d=mm'
 
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment