summaryrefslogtreecommitdiff
path: root/app/views/layouts/nav
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2017-10-10 12:48:19 +0000
committerDouwe Maan <douwe@gitlab.com>2017-10-10 12:48:19 +0000
commit36ae3bf1ca476515ba66f6e3e505cbb035534764 (patch)
treecb7f5dfafb8ac52e512237232a5a64c9ffd888cf /app/views/layouts/nav
parentb71208531a492fa5e5266dba32e0a4949b29f51f (diff)
parent75c6953fc76422b138335680b227e7303d20c136 (diff)
downloadgitlab-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/layouts/nav')
-rw-r--r--app/views/layouts/nav/sidebar/_group.html.haml2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/layouts/nav/sidebar/_group.html.haml b/app/views/layouts/nav/sidebar/_group.html.haml
index 8cba495f7e4..0bf318b0b66 100644
--- a/app/views/layouts/nav/sidebar/_group.html.haml
+++ b/app/views/layouts/nav/sidebar/_group.html.haml
@@ -6,7 +6,7 @@
.context-header
= link_to group_path(@group), title: @group.name do
.avatar-container.s40.group-avatar
- = image_tag group_icon(@group), class: "avatar s40 avatar-tile"
+ = group_icon(@group, class: "avatar s40 avatar-tile")
.sidebar-context-title
= @group.name
%ul.sidebar-top-level-items