Download as
Browse Code »

Commit 6e47fbf5d9432c065199322a47bc465fccf9a132

Authored by Dmitriy Zaporozhets
2 parents 39aeac71 348e44ef
Exists in spb-stable and in 3 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb

Merge branch 'bug/gravatr_select2' into 'master' 

Dont use gravatars for user select if gravatar is disabled

Fixes #836
Showing 2 changed files with 4 additions and 1 deletions   Show diff stats
app/assets/javascripts/users_select.js.coffee
  Diff comments   View file @6e47fbf
@@ -2,10 +2,12 @@ $ -> @@ -2,10 +2,12 @@ $ ->
2 userFormatResult = (user) -> 2 userFormatResult = (user) ->
3 if user.avatar 3 if user.avatar
4 avatar = user.avatar.url 4 avatar = user.avatar.url
5 - else 5 + else if gon.gravatar_enabled
6 avatar = gon.gravatar_url 6 avatar = gon.gravatar_url
7 avatar = avatar.replace('%{hash}', md5(user.email)) 7 avatar = avatar.replace('%{hash}', md5(user.email))
8 avatar = avatar.replace('%{size}', '24') 8 avatar = avatar.replace('%{size}', '24')
  9 + else
  10 + avatar = gon.relative_url_root + "/assets/no_avatar.png"
9 11
10 "<div class='user-result'> 12 "<div class='user-result'>
11 <div class='user-image'><img class='avatar s24' src='#{avatar}'></div> 13 <div class='user-image'><img class='avatar s24' src='#{avatar}'></div>
app/controllers/application_controller.rb
  Diff comments   View file @6e47fbf
@@ -171,6 +171,7 @@ class ApplicationController &lt; ActionController::Base @@ -171,6 +171,7 @@ class ApplicationController &lt; ActionController::Base
171 gon.api_token = current_user.private_token if current_user 171 gon.api_token = current_user.private_token if current_user
172 gon.gravatar_url = request.ssl? || Gitlab.config.gitlab.https ? Gitlab.config.gravatar.ssl_url : Gitlab.config.gravatar.plain_url 172 gon.gravatar_url = request.ssl? || Gitlab.config.gitlab.https ? Gitlab.config.gravatar.ssl_url : Gitlab.config.gravatar.plain_url
173 gon.relative_url_root = Gitlab.config.gitlab.relative_url_root 173 gon.relative_url_root = Gitlab.config.gitlab.relative_url_root
  174 + gon.gravatar_enabled = Gitlab.config.gravatar.enabled
174 end 175 end
175 176
176 def check_password_expiration 177 def check_password_expiration