kallithea Changeset - 9d8f63ff9219

Changeset - 9d8f63ff9219

Parent rev.

Child rev.

[Not reviewed]

Merge beta

0 2 0

Marcin Kuzminski - 13 years ago 2012-08-24 14:58:26
marcin@python-works.com

Merged in domruf/rhodecode (pull request #66)

2 files changed with 12 insertions and 0 deletions:

rhodecode/config/deployment.ini_tmpl

rhodecode/lib/helpers.py

0 comments (0 inline, 0 general)

rhodecode/config/deployment.ini_tmpl

➞

Show inline comments

@@ @@ -63,6 +63,13 @@ cut_off_limit = 256000 @@
 force_https = false
 commit_parse_limit = 50
 use_gravatar = true
 ## alternative_gravatar_url allows you to use your own avatar server application
 ## the following parts of the URL will be replaced
 ## %(email)s        user email
 ## %(md5email)s     md5 hash of the user email (like at gravatar.com)
 ## %(size)s         size of the image that is expected from the server application
 #alternative_gravatar_url = http://myavatarserver.com/getbyemail/%(email)s/%(size)s
 #alternative_gravatar_url = http://myavatarserver.com/getbymd5/%(md5email)s?s=%(size)s
 container_auth_enabled = false
 proxypass_auth_enabled = false
 default_encoding = utf8

rhodecode/lib/helpers.py

➞

Show inline comments

@@ @@ -711,6 +711,11 @@ HasRepoPermissionAny, HasRepoPermissionA @@
 #==============================================================================
 def gravatar_url(email_address, size=30):
     if(str2bool(config['app_conf'].get('use_gravatar')) and
        config['app_conf'].get('alternative_gravatar_url')):
         return config['app_conf'].get('alternative_gravatar_url') % {'email': email_address,
                                                                      'md5email': hashlib.md5(email_address.lower()).hexdigest(),
                                                                      'size': size}
     if (not str2bool(config['app_conf'].get('use_gravatar')) or
         not email_address or email_address == 'anonymous@rhodecode.org'):
         f = lambda a, l: min(l, key=lambda x: abs(x - a))

0 comments (0 inline, 0 general)