diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-10-10 15:48:19 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-10-10 15:48:19 +0300 |
| commit | 36ae3bf1ca476515ba66f6e3e505cbb035534764 (patch) | |
| tree | cb7f5dfafb8ac52e512237232a5a64c9ffd888cf /app/serializers | |
| parent | b71208531a492fa5e5266dba32e0a4949b29f51f (diff) | |
| parent | 75c6953fc76422b138335680b227e7303d20c136 (diff) | |
Merge branch '38245-private-avatars-are-not-cdn-compatible' into 'master'
Resolve "Private Avatars are not CDN compatible"
Closes #38245 and gitlab-com/support-forum#2476
See merge request gitlab-org/gitlab-ce!14443
Diffstat (limited to 'app/serializers')
| -rw-r--r-- | app/serializers/group_entity.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/serializers/group_entity.rb b/app/serializers/group_entity.rb index 7c872a3e986..6d8466da902 100644 --- a/app/serializers/group_entity.rb +++ b/app/serializers/group_entity.rb @@ -45,6 +45,6 @@ class GroupEntity < Grape::Entity end expose :avatar_url do |group| - group_icon(group) + group_icon_url(group) end end |