summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-01-14 02:55:54 -0800
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-01-14 02:55:54 -0800
commit5a52c9b0a69936d612be84704d7616bf8306c2af (patch)
tree10305e2e11ec20623c4819ec70c9c638bb56596e
parent798f82f4869d723b772c4cb7956bb9a72cb62fe4 (diff)
parentd5bb466fe4aa44b5c303d7ba55f48af752e164da (diff)
downloadgitlab-ce-5a52c9b0a69936d612be84704d7616bf8306c2af.tar.gz
Merge pull request #6038 from jvanbaarsen/fix-5767
Fix for #5767
-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"