diff options
| author | Phil Hughes <me@iamphill.com> | 2017-09-04 15:30:03 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-09-04 15:30:03 +0100 |
| commit | 3569b2e2d715ffeecf27e26cf3d8c9ec08b8ad49 (patch) | |
| tree | 2c3ccbe19c476d543956a72d8a63cfbae5aa4bae /app/helpers/groups_helper.rb | |
| parent | f0248fa8c0620eb70e70b8ccdcff89ee7797ac4f (diff) | |
| parent | ebbbc7ef52fbd1d3339e2e21be967d313a074a28 (diff) | |
| download | gitlab-ce-3569b2e2d715ffeecf27e26cf3d8c9ec08b8ad49.tar.gz | |
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 3edeb406b36..4b8549dcb9b 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 #{'hidable' if hidable}") do output = - if show_new_nav? && group.try(:avatar_url) || (show_new_nav? && show_avatar) + if (show_new_nav? && group.try(:avatar_url) || (show_new_nav? && show_avatar)) && !Rails.env.test? image_tag(group_icon(group), class: "avatar-tile", width: 16, height: 16) else "" |