Download as
Browse Code »

Commit 9f2183f904cf3a4b8bcfd653b023aa4a9427c0c1

Authored by Dmitriy Zaporozhets
2 parents 94f8e801 c18e2778
Exists in spb-stable and in 2 other branches 7-0-stable, 7-0-stable-spb

Merge pull request #7002 from olafmandel/user_avatar_in_relative_root 

Fix avatar URLs in JS-lists for relative_url_root
Showing 2 changed files with 2 additions and 2 deletions   Show diff stats
app/assets/javascripts/project_users_select.js.coffee
  Diff comments   View file @9f2183f
... ... @@ -37,7 +37,7 @@
37 37  
38 38 projectUserFormatResult: (user) ->
39 39 if user.avatar_url
40   - avatar = user.avatar_url
  40 + avatar = gon.relative_url_root + user.avatar_url
41 41 else if gon.gravatar_enabled
42 42 avatar = gon.gravatar_url
43 43 avatar = avatar.replace('%{hash}', md5(user.email))
... ...
app/assets/javascripts/users_select.js.coffee
  Diff comments   View file @9f2183f
1 1 $ ->
2 2 userFormatResult = (user) ->
3 3 if user.avatar_url
4   - avatar = user.avatar_url
  4 + avatar = gon.relative_url_root + user.avatar_url
5 5 else if gon.gravatar_enabled
6 6 avatar = gon.gravatar_url
7 7 avatar = avatar.replace('%{hash}', md5(user.email))
... ...