Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeo Antunes <leonardo.antunes@dmc.de>2015-04-17 12:05:52 +0300
committerLeo Antunes <leonardo.antunes@dmc.de>2015-04-20 10:52:03 +0300
commitf2a817f040315f5defaa4c9cf32b1a4455fe6df5 (patch)
treec063331ee4fbaee9237bee14dad8936a25a1c117 /app/assets/javascripts/branch-graph.js.coffee
parente883aae0e7cd7765153fd488a26f756c007f54a2 (diff)
do not prepend relative_url_root to avatar
The commit.author.icon variable contains a full URL, which gets broken when prepended by the relative_url_root setting (generating hrefs like "/gitlabhttps://...".
Diffstat (limited to 'app/assets/javascripts/branch-graph.js.coffee')
-rw-r--r--app/assets/javascripts/branch-graph.js.coffee2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/branch-graph.js.coffee b/app/assets/javascripts/branch-graph.js.coffee
index 010a2b0e42b..917228bd276 100644
--- a/app/assets/javascripts/branch-graph.js.coffee
+++ b/app/assets/javascripts/branch-graph.js.coffee
@@ -214,7 +214,7 @@ class @BranchGraph
stroke: @colors[commit.space]
"stroke-width": 2
)
- r.image(gon.relative_url_root + commit.author.icon, avatar_box_x, avatar_box_y, 20, 20)
+ 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"