Commit 3fc6eff5 authored by Douwe Maan's avatar Douwe Maan

Merge branch 'backport/groups-helper-refactor' into 'master'

Backport groups_helper refactor from gitlab-org/gitlab-ee!904

This is a simple backport from a change in `groups_helper.rb` introduced by gitlab-org/gitlab-ee!904, requested here: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/904#note_18894726

See merge request !7767
parents d2813832 b72bd838
...@@ -8,11 +8,7 @@ module GroupsHelper ...@@ -8,11 +8,7 @@ module GroupsHelper
group = Group.find_by(path: group) group = Group.find_by(path: group)
end end
if group && group.avatar.present? group.try(:avatar_url) || image_path('no_group_avatar.png')
group.avatar.url
else
image_path('no_group_avatar.png')
end
end end
def group_title(group, name = nil, url = nil) def group_title(group, name = nil, url = nil)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment