summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/branch-graph.js.coffee
diff options
context:
space:
mode:
authorJeroen van Baarsen <jeroenvanbaarsen@gmail.com>2014-01-13 22:21:25 +0100
committerJeroen van Baarsen <jeroenvanbaarsen@gmail.com>2014-01-13 22:22:46 +0100
commitd5bb466fe4aa44b5c303d7ba55f48af752e164da (patch)
treecdff2b915e45edbadda5f5301d6dff5a9129fb22 /app/assets/javascripts/branch-graph.js.coffee
parent55024ed13af87cea939c6250103c11f8a6e6fa10 (diff)
downloadgitlab-ce-d5bb466fe4aa44b5c303d7ba55f48af752e164da.tar.gz
Fix for #5767
In the branch graph, uploaded images where not rendered correctly. Fixed this by not filling the rect, instead i've put an image over it
Diffstat (limited to 'app/assets/javascripts/branch-graph.js.coffee')
-rw-r--r--app/assets/javascripts/branch-graph.js.coffee7
1 files changed, 5 insertions, 2 deletions
diff --git a/app/assets/javascripts/branch-graph.js.coffee b/app/assets/javascripts/branch-graph.js.coffee
index 318538509a5..dd09ee51fe0 100644
--- a/app/assets/javascripts/branch-graph.js.coffee
+++ b/app/assets/javascripts/branch-graph.js.coffee
@@ -194,11 +194,14 @@ class BranchGraph
fill: @colors[commit.space]
stroke: "none"
)
- r.rect(@offsetX + @unitSpace * @mspace + 10, y - 10, 20, 20).attr(
- fill: "url(#{commit.author.icon})"
+
+ avatar_box_x = @offsetX + @unitSpace * @mspace + 10
+ avatar_box_y = y - 10
+ r.rect(avatar_box_x, avatar_box_y, 20, 20).attr(
stroke: @colors[commit.space]
"stroke-width": 2
)
+ r.image(commit.author.icon, avatar_box_x, avatar_box_y, 20, 20)
r.text(@offsetX + @unitSpace * @mspace + 35, y, commit.message.split("\n")[0]).attr(
"text-anchor": "start"
font: "14px Monaco, monospace"