diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-04-08 15:17:51 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-04-08 15:17:51 +0300 |
| commit | e6707f6f278352d7ca63d9c0a3a3780e6c97be42 (patch) | |
| tree | 8941b2215f84ee08283fe9048799195588825ec6 | |
| parent | f88d30fac86b317248dbb47e01b050d9c1edbadf (diff) | |
| parent | 5bae15bea0865c70eae8488600dba1ade4547071 (diff) | |
| download | gitlab-ce-e6707f6f278352d7ca63d9c0a3a3780e6c97be42.tar.gz | |
Merge pull request #6720 from thmo/6-7-stable
Fix avatars in the network graph for relative-url setups.
| -rw-r--r-- | app/assets/javascripts/branch-graph.js.coffee | 4 |
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) |