Merge branch '44508-fix-fork-namespace-images' into 'master'

Resolve "When forking any project, the images (avatar) of the groups (and subgroups) are not loaded." Closes #44508 See merge request gitlab-org/gitlab-ce!18048

Merge branch '44508-fix-fork-namespace-images' into 'master'
a91b158e · Rémy Coutable · bc2eff8d · 22d9390b · a91b158e · a91b158e
Commit a91b158e authored Mar 28, 2018 by Rémy Coutable
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

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

44508-fix-fork-namespace-images.yml changelogs/unreleased/44508-fix-fork-namespace-images.yml +5 -0

No files found.
--- a/app/helpers/namespaces_helper.rb
+++ b/app/helpers/namespaces_helper.rb
@@ -31,7 +31,7 @@ module NamespacesHelper

  def namespace_icon(namespace, size = 40)
    if namespace.is_a?(Group)
-      group_icon(namespace)
+      group_icon_url(namespace)
    else
      avatar_icon_for_user(namespace.owner, size)
    end

--- a/changelogs/unreleased/44508-fix-fork-namespace-images.yml
+++ b/changelogs/unreleased/44508-fix-fork-namespace-images.yml
+---
+title: Fix bug rendering group icons when forking
+merge_request:
+author:
+type: fixed