summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2015-09-23 08:42:32 -0700
committerRobert Speicher <rspeicher@gmail.com>2015-09-24 14:24:05 -0400
commit222ededa34a276d8f5744fd52c519612eaed7e74 (patch)
tree908c8a5d5d2a4ac1d546f42a7ad334d2c3b7de06
parent5f0983b207013543f463dab037a9f76b85d9afc8 (diff)
downloadgitlab-ce-222ededa34a276d8f5744fd52c519612eaed7e74.tar.gz
Fix default avatar not showing up in network graph
Closes https://github.com/gitlabhq/gitlabhq/issues/9657
-rw-r--r--CHANGELOG1
-rw-r--r--app/views/projects/network/show.json.erb2
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 9e476eb5137..c07acac4453 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
Please view this file on the master branch, on stable branches it's out of date.
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,