diff options
| author | Robert Speicher <robert@gitlab.com> | 2015-09-24 17:50:01 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2015-09-24 17:50:01 +0000 |
| commit | ede1ee851a4fd185988f4c73acab3153cf6f4a3e (patch) | |
| tree | a6e0b767f2625e8941f66df190d505129bb9e85a | |
| parent | 3656c2fa5379a8ec7eb9fba1a2fdc1b91166bd15 (diff) | |
| parent | 452621208caecec6d4b11f94e17e3a5ed0519baa (diff) | |
| download | gitlab-ce-ede1ee851a4fd185988f4c73acab3153cf6f4a3e.tar.gz | |
Merge branch 'fix-default-avatar-in-network-graph' into 'master'
Fix default avatar not showing up in network graph
The change in 71cdb24990b 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
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/views/projects/network/show.json.erb | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG index 710f99cbf51..7e96d9bbbc5 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -11,6 +11,7 @@ v 8.1.0 (unreleased) - Remove "Continuous Integration" page from dashboard v 8.0.2 (unreleased) + - Fix default avatar not rendering in network graph (Stan Hu) - Skip check_initd_configured_correctly on omnibus installs - Prevent double-prefixing of help page paths - Clarify confirmation text on user deletion diff --git a/app/views/projects/network/show.json.erb b/app/views/projects/network/show.json.erb index dc82adcb2c6..122e84b41b2 100644 --- a/app/views/projects/network/show.json.erb +++ b/app/views/projects/network/show.json.erb @@ -9,7 +9,7 @@ author: { name: c.author_name, email: c.author_email, - icon: avatar_icon(c.author_email, 20) + icon: image_path(avatar_icon(c.author_email, 20)) }, time: c.time, space: c.spaces.first, |