diff options
| author | Phil Hughes <me@iamphill.com> | 2017-09-06 14:12:19 +0300 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-09-06 14:12:19 +0300 |
| commit | 2aa8a75f69e338a94cca52a43058d156c0e3a1a1 (patch) | |
| tree | 47b5f489b69e2d2e4e389fdd2586cca3781a8da7 /app/helpers/groups_helper.rb | |
| parent | de82bd8e447ae7b4b7e66f0368f5f43311848186 (diff) | |
| parent | 1632ffa6ad16738994122f0e84f331d50f220879 (diff) | |
Merge branch 'master' into breadcrumbs-improvements
Diffstat (limited to 'app/helpers/groups_helper.rb')
| -rw-r--r-- | app/helpers/groups_helper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/helpers/groups_helper.rb b/app/helpers/groups_helper.rb index d330bd644e5..9e7c25492b7 100644 --- a/app/helpers/groups_helper.rb +++ b/app/helpers/groups_helper.rb @@ -86,7 +86,7 @@ module GroupsHelper def group_title_link(group, hidable: false, show_avatar: false) link_to(group_path(group), class: "group-path breadcrumb-item-text js-breadcrumb-item-text #{'hidable' if hidable}") do output = - if (show_new_nav? && group.try(:avatar_url) || (show_new_nav? && show_avatar)) && !Rails.env.test? + if (group.try(:avatar_url) || show_avatar)) && !Rails.env.test? image_tag(group_icon(group), class: "avatar-tile", width: 15, height: 15) else "" |