merge with optional gravatars

development.ini

@@ -49,6 +49,7 b' app_instance_uuid = develop'
 cut_off_limit = 256000
 force_https = false
 commit_parse_limit = 25
+use_gravatar = true
 
 ####################################
 ###        CELERY CONFIG        ####

production.ini

@@ -48,6 +48,7 b' index_dir = %(here)s/data/index'
 cut_off_limit = 256000
 force_https = false
 commit_parse_limit = 250
+use_gravatar = true
 
 ####################################
 ###        CELERY CONFIG        ####

rhodecode/config/deployment.ini_tmpl

@@ -49,6 +49,7 b' app_instance_uuid = ${app_instance_uuid}'
 cut_off_limit = 256000
 force_https = false 
 commit_parse_limit = 50
+use_gravatar = true
 
 ####################################
 ###        CELERY CONFIG        ####

rhodecode/lib/helpers.py

@@ -10,7 +10,7 b' import urllib'
 
 from pygments.formatters import HtmlFormatter
 from pygments import highlight as code_highlight
-from pylons import url, request
+from pylons import url, request, config
 from pylons.i18n.translation import _, ungettext
 
 from webhelpers.html import literal, HTML, escape
@@ -35,6 +35,7 b' from webhelpers.html.tags import _set_in'
 
 from vcs.utils.annotate import annotate_highlight
 from rhodecode.lib.utils import repo_name_slug
+from rhodecode.lib import str2bool
 
 def _reset(name, value=None, id=NotGiven, type="reset", **attrs):
     """Reset button
@@ -565,6 +566,9 b' HasRepoPermissionAny, HasRepoPermissionA'
 #==============================================================================
 
 def gravatar_url(email_address, size=30):
+    if not str2bool(config['app_conf'].get('use_gravatar')):
+        return "/images/user%s.png" % size
+
     ssl_enabled = 'https' == request.environ.get('wsgi.url_scheme')
     default = 'identicon'
     baseurl_nossl = "http://www.gravatar.com/avatar/"