summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorThomas Moschny <thomas.moschny@gmx.de>2014-04-07 19:10:28 +0200
committerMarin Jankovski <marin@gitlab.com>2014-04-10 10:05:40 +0200
commit5b123dbf7f587a58db2b45390dff43fa167dbb04 (patch)
treee4111c09827e3233062e73d988dbad290f10fd5c /app
parent5830d672f7caf8c4a2d0dcc63f9a096523b3cb32 (diff)
downloadgitlab-ce-5b123dbf7f587a58db2b45390dff43fa167dbb04.tar.gz
Fix avatars in the network graph for relative-url setups.
Diffstat (limited to 'app')
-rw-r--r--app/assets/javascripts/branch-graph.js.coffee4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/branch-graph.js.coffee b/app/assets/javascripts/branch-graph.js.coffee
index dd09ee51fe0..f6d57bd55bb 100644
--- a/app/assets/javascripts/branch-graph.js.coffee
+++ b/app/assets/javascripts/branch-graph.js.coffee
@@ -201,7 +201,7 @@ class BranchGraph
stroke: @colors[commit.space]
"stroke-width": 2
)
- r.image(commit.author.icon, avatar_box_x, avatar_box_y, 20, 20)
+ r.image(gon.relative_url_root + 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"
@@ -274,7 +274,7 @@ class BranchGraph
Raphael::commitTooltip = (x, y, commit) ->
boxWidth = 300
boxHeight = 200
- icon = @image(commit.author.icon, x, y, 20, 20)
+ icon = @image(gon.relative_url_root + commit.author.icon, x, y, 20, 20)
nameText = @text(x + 25, y + 10, commit.author.name)
idText = @text(x, y + 35, commit.id)
messageText = @text(x, y + 50, commit.message)