summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen van Baarsen <jeroenvanbaarsen@gmail.com>2015-04-20 11:01:59 +0200
committerJeroen van Baarsen <jeroenvanbaarsen@gmail.com>2015-04-20 11:01:59 +0200
commit4f349fcb691bde95c50f7c92928be9e769308f2f (patch)
tree1fa40621e0df2b63f4fc784a224eca6efd5399f7
parent0e9d52f33d9c5cfe859da80628b46338a39f1134 (diff)
parentf2a817f040315f5defaa4c9cf32b1a4455fe6df5 (diff)
downloadgitlab-ce-4f349fcb691bde95c50f7c92928be9e769308f2f.tar.gz
Merge pull request #9150 from digitalmediacenter/master
do not prepend relative_url_root to avatar
-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"