diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-06-02 11:29:33 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-06-02 11:29:33 +0000 |
| commit | f828b74483a68baaadc3a4095ec6911087995892 (patch) | |
| tree | d5ca2ec85255f54d93471cbf9c8ce2cc56a669b1 | |
| parent | 8d23e8724265db7e0bf3f736a67737d86f6ede1c (diff) | |
| parent | 1521dc51e9f0c37434c8290d67d775bc9fde188d (diff) | |
| download | gitlab-ce-f828b74483a68baaadc3a4095ec6911087995892.tar.gz | |
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
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/helpers/groups_helper.rb | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG index a0df8396662..6f91dfcfb68 100644 --- 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 diff --git a/app/helpers/groups_helper.rb b/app/helpers/groups_helper.rb index b1f0a765bb9..4cac69c6795 100644 --- 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 |