Merge branch '14446-no_group_avatar-png-link' into 'master'

Fix link to blank group icon When the group is the default blank icon, this needs to use the `image_path` helper; otherwise, the link won't work if assets are precompiled. This still works fine for uploaded icons in either case. Closes #14446. See merge request !4375

Merge branch '14446-no_group_avatar-png-link' into 'master'
f828b744 · Rémy Coutable · 8d23e872 · 1521dc51 · f828b744 · f828b744
Commit f828b744 authored Jun 02, 2016 by Rémy Coutable
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

CHANGELOG CHANGELOG +1 -0

groups_helper.rb app/helpers/groups_helper.rb +1 -1

No files found.
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -19,6 +19,7 @@ v 8.9.0 (unreleased)
  - Fix issues filter when ordering by milestone
  - Todos will display target state if issuable target is 'Closed' or 'Merged'
  - Fix bug when sorting issues by milestone due date and filtering by two or more labels
+  - Link to blank group icon doesn't throw a 404 anymore
  - Remove 'main language' feature
  - Pipelines can be canceled only when there are running builds
  - Use downcased path to container repository as this is expected path by Docker

--- a/app/helpers/groups_helper.rb
+++ b/app/helpers/groups_helper.rb
@@ -31,7 +31,7 @@ module GroupsHelper
    if group && group.avatar.present?
      group.avatar.url
    else
-      'no_group_avatar.png'
+      image_path('no_group_avatar.png')
    end
  end