summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean McGivern <sean@gitlab.com>2016-05-31 13:02:12 +0100
committerSean McGivern <sean@gitlab.com>2016-06-02 11:19:27 +0100
commit1521dc51e9f0c37434c8290d67d775bc9fde188d (patch)
tree94ce2eb3df54e2fe49cac4af5896d61bbf5e182d
parentacfbeced52db321534c7b03a56a909e280d26914 (diff)
downloadgitlab-ce-1521dc51e9f0c37434c8290d67d775bc9fde188d.tar.gz
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.
-rw-r--r--CHANGELOG1
-rw-r--r--app/helpers/groups_helper.rb2
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index d1cde40c1c7..74ea27a2e05 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