diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-10-10 12:48:19 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-10-10 12:48:19 +0000 |
| commit | 36ae3bf1ca476515ba66f6e3e505cbb035534764 (patch) | |
| tree | cb7f5dfafb8ac52e512237232a5a64c9ffd888cf /app/views/groups | |
| parent | b71208531a492fa5e5266dba32e0a4949b29f51f (diff) | |
| parent | 75c6953fc76422b138335680b227e7303d20c136 (diff) | |
| download | gitlab-ce-36ae3bf1ca476515ba66f6e3e505cbb035534764.tar.gz | |
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/views/groups')
| -rw-r--r-- | app/views/groups/_home_panel.html.haml | 2 | ||||
| -rw-r--r-- | app/views/groups/edit.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/groups/_home_panel.html.haml b/app/views/groups/_home_panel.html.haml index 181c7bee702..a0760c2073b 100644 --- a/app/views/groups/_home_panel.html.haml +++ b/app/views/groups/_home_panel.html.haml @@ -1,7 +1,7 @@ .group-home-panel.text-center %div{ class: container_class } .avatar-container.s70.group-avatar - = image_tag group_icon(@group), class: "avatar s70 avatar-tile" + = group_icon(@group, class: "avatar s70 avatar-tile") %h1.group-title = @group.name %span.visibility-icon.has-tooltip{ data: { container: 'body' }, title: visibility_icon_description(@group) } diff --git a/app/views/groups/edit.html.haml b/app/views/groups/edit.html.haml index 15606dd30fd..16038ef2f79 100644 --- a/app/views/groups/edit.html.haml +++ b/app/views/groups/edit.html.haml @@ -10,7 +10,7 @@ .form-group .col-sm-offset-2.col-sm-10 .avatar-container.s160 - = image_tag group_icon(@group), alt: '', class: 'avatar group-avatar s160' + = group_icon(@group, alt: '', class: 'avatar group-avatar s160') %p.light - if @group.avatar? You can change your group avatar here |