summaryrefslogtreecommitdiff
path: root/app/views/groups
diff options
context:
space:
mode:
authorTim Zallmann <tzallmann@gitlab.com>2017-10-02 13:35:01 +0200
committerTim Zallmann <tzallmann@gitlab.com>2017-10-04 14:27:09 +0200
commit892b02e890be539a95e6b52feb14f5d188513700 (patch)
tree661aa31f1b090a134af39ab08a038017c2a0fbf3 /app/views/groups
parent79c80de99d511d084cff072bd90192ffe8ba4cda (diff)
downloadgitlab-ce-892b02e890be539a95e6b52feb14f5d188513700.tar.gz
Created group_icon and group_icon_url
Tests for these new helper methods
Diffstat (limited to 'app/views/groups')
-rw-r--r--app/views/groups/_home_panel.html.haml2
-rw-r--r--app/views/groups/edit.html.haml2
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