Commit ede1ee85 authored by Robert Speicher's avatar Robert Speicher
Browse files

Merge branch 'fix-default-avatar-in-network-graph' into 'master'

Fix default avatar not showing up in network graph

The change in 1f0a8c559a9e removed the `/assets` path in the default avatar to eliminate runtime errors, but this was one place where `image_path` was missed. If the user full URL is specified, `image_path` does nothing.

Closes https://github.com/gitlabhq/gitlabhq/issues/9657

See merge request !1411
...@@ -11,6 +11,7 @@ v 8.1.0 (unreleased) ...@@ -11,6 +11,7 @@ v 8.1.0 (unreleased)
- Remove "Continuous Integration" page from dashboard - Remove "Continuous Integration" page from dashboard
v 8.0.2 (unreleased) v 8.0.2 (unreleased)
- Fix default avatar not rendering in network graph (Stan Hu)
- Skip check_initd_configured_correctly on omnibus installs - Skip check_initd_configured_correctly on omnibus installs
- Prevent double-prefixing of help page paths - Prevent double-prefixing of help page paths
- Clarify confirmation text on user deletion - Clarify confirmation text on user deletion
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
author: { author: {
name: c.author_name, name: c.author_name,
email: c.author_email, email: c.author_email,
icon: avatar_icon(c.author_email, 20) icon: image_path(avatar_icon(c.author_email, 20))
}, },
time: c.time, time: c.time,
space: c.spaces.first, space: c.spaces.first,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment