diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-05-22 22:17:04 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-05-22 22:17:04 +0300 |
| commit | 9f2183f904cf3a4b8bcfd653b023aa4a9427c0c1 (patch) | |
| tree | da8eca8a4f13d62f31ca1e226d9cb740722901c2 /app | |
| parent | 94f8e801a5e189ada9698fa589dd004842cd0ad9 (diff) | |
| parent | c18e2778b2f1a4a2c3fb8e0f79c400456645e036 (diff) | |
| download | gitlab-ce-9f2183f904cf3a4b8bcfd653b023aa4a9427c0c1.tar.gz | |
Merge pull request #7002 from olafmandel/user_avatar_in_relative_root
Fix avatar URLs in JS-lists for relative_url_root
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/project_users_select.js.coffee | 2 | ||||
| -rw-r--r-- | app/assets/javascripts/users_select.js.coffee | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/project_users_select.js.coffee b/app/assets/javascripts/project_users_select.js.coffee index b0e39610feb..a7fec960406 100644 --- a/app/assets/javascripts/project_users_select.js.coffee +++ b/app/assets/javascripts/project_users_select.js.coffee @@ -37,7 +37,7 @@ projectUserFormatResult: (user) -> if user.avatar_url - avatar = user.avatar_url + avatar = gon.relative_url_root + user.avatar_url else if gon.gravatar_enabled avatar = gon.gravatar_url avatar = avatar.replace('%{hash}', md5(user.email)) diff --git a/app/assets/javascripts/users_select.js.coffee b/app/assets/javascripts/users_select.js.coffee index ce9a505b1e3..cab9f6271eb 100644 --- a/app/assets/javascripts/users_select.js.coffee +++ b/app/assets/javascripts/users_select.js.coffee @@ -1,7 +1,7 @@ $ -> userFormatResult = (user) -> if user.avatar_url - avatar = user.avatar_url + avatar = gon.relative_url_root + user.avatar_url else if gon.gravatar_enabled avatar = gon.gravatar_url avatar = avatar.replace('%{hash}', md5(user.email)) |