diff options
author | Rémy Coutable <remy@rymai.me> | 2019-01-14 16:42:36 +0000 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2019-01-14 16:42:36 +0000 |
commit | 8285205815ccdb25238fcae1c1e91063a46f19b0 (patch) | |
tree | e304247d4890095d97b3e2b78016ab78f4a150dc /lib | |
parent | c98e858d5786aee07fbef5164a7fe7ca152f8858 (diff) | |
parent | 2265ce34afe05d2011343cf5674db979e6c250de (diff) | |
download | gitlab-ce-8285205815ccdb25238fcae1c1e91063a46f19b0.tar.gz |
Merge branch 'sh-fix-gon-helper-avatar' into 'master'
Fix no avatar not showing in user selection box
Closes #56268
See merge request gitlab-org/gitlab-ce!24346
Diffstat (limited to 'lib')
-rw-r--r-- | lib/gitlab/gon_helper.rb | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/lib/gitlab/gon_helper.rb b/lib/gitlab/gon_helper.rb index 15137140639..9b1794eec91 100644 --- a/lib/gitlab/gon_helper.rb +++ b/lib/gitlab/gon_helper.rb @@ -8,10 +8,7 @@ module Gitlab def add_gon_variables gon.api_version = 'v4' - gon.default_avatar_url = - Gitlab::Utils.append_path( - Gitlab.config.gitlab.url, - ActionController::Base.helpers.image_path('no_avatar.png')) + gon.default_avatar_url = default_avatar_url gon.max_file_size = Gitlab::CurrentSettings.max_attachment_size gon.asset_host = ActionController::Base.asset_host gon.webpack_public_path = webpack_public_path @@ -50,5 +47,15 @@ module Gitlab # use this method to push multiple feature flags. gon.push({ features: { var_name => enabled } }, true) end + + def default_avatar_url + # We can't use ActionController::Base.helpers.image_url because it + # doesn't return an actual URL because request is nil for some reason. + # + # We also can't use Gitlab::Utils.append_path because the image path + # may be an absolute URL. + URI.join(Gitlab.config.gitlab.url, + ActionController::Base.helpers.image_path('no_avatar.png')).to_s + end end end |