diff options
| author | Douwe Maan <douwe@gitlab.com> | 2016-11-28 03:45:32 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2016-11-28 03:45:32 +0000 |
| commit | 3fc6eff5fce225610812cf3efdfcf8498a7b4144 (patch) | |
| tree | b9b2bbedd6a9f2db95a8997f7169680bee9de685 | |
| parent | d2813832615c6baf1f176c39b260b66a702d3e70 (diff) | |
| parent | b72bd838d76015fb9ef0ab4d8be57a9c8130b744 (diff) | |
| download | gitlab-ce-3fc6eff5fce225610812cf3efdfcf8498a7b4144.tar.gz | |
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
| -rw-r--r-- | app/helpers/groups_helper.rb | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/app/helpers/groups_helper.rb b/app/helpers/groups_helper.rb index 75cd9eece5c..19ab059aea6 100644 --- a/app/helpers/groups_helper.rb +++ b/app/helpers/groups_helper.rb @@ -8,11 +8,7 @@ module GroupsHelper group = Group.find_by(path: group) end - if group && group.avatar.present? - group.avatar.url - else - image_path('no_group_avatar.png') - end + group.try(:avatar_url) || image_path('no_group_avatar.png') end def group_title(group, name = nil, url = nil) |