diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-02-11 18:28:21 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-02-11 18:28:21 +0000 |
| commit | 6e47fbf5d9432c065199322a47bc465fccf9a132 (patch) | |
| tree | 54bc7bc8c8c7b6f6e9de015af56ae82ea5d9a7c0 | |
| parent | 39aeac71b34648d8c691ff36f577bdacbd3e362f (diff) | |
| parent | 348e44ef06c3ebc89ada47c64d7bec5bf56dfd54 (diff) | |
| download | gitlab-ce-6e47fbf5d9432c065199322a47bc465fccf9a132.tar.gz | |
Merge branch 'bug/gravatr_select2' into 'master'
Dont use gravatars for user select if gravatar is disabled
Fixes #836
| -rw-r--r-- | app/assets/javascripts/users_select.js.coffee | 4 | ||||
| -rw-r--r-- | app/controllers/application_controller.rb | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/app/assets/javascripts/users_select.js.coffee b/app/assets/javascripts/users_select.js.coffee index 92cd3a9905b..c1fa16ca89c 100644 --- a/app/assets/javascripts/users_select.js.coffee +++ b/app/assets/javascripts/users_select.js.coffee @@ -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> diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 442b1b65ce8..5f6485e57c5 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -171,6 +171,7 @@ class ApplicationController < ActionController::Base 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 |