Skip to content

G
gitlab-ce
Commit 9f2183f9 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files
Options

Merge pull request #7002 from olafmandel/user_avatar_in_relative_root 

Fix avatar URLs in JS-lists for relative_url_root
parents 94f8e801 c18e2778
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
app/assets/javascripts/project_users_select.js.coffee
View file @ 9f2183f9
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
projectUserFormatResult: (user) -> projectUserFormatResult: (user) ->
if user.avatar_url if user.avatar_url
avatar = user.avatar_url avatar = gon.relative_url_root + user.avatar_url
else if gon.gravatar_enabled else if gon.gravatar_enabled
avatar = gon.gravatar_url avatar = gon.gravatar_url
avatar = avatar.replace('%{hash}', md5(user.email)) avatar = avatar.replace('%{hash}', md5(user.email))
......
app/assets/javascripts/users_select.js.coffee
View file @ 9f2183f9
$ -> $ ->
userFormatResult = (user) -> userFormatResult = (user) ->
if user.avatar_url if user.avatar_url
avatar = user.avatar_url avatar = gon.relative_url_root + user.avatar_url
else if gon.gravatar_enabled else if gon.gravatar_enabled
avatar = gon.gravatar_url avatar = gon.gravatar_url
avatar = avatar.replace('%{hash}', md5(user.email)) avatar = avatar.replace('%{hash}', md5(user.email))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7