From fe1553e943fd1c0734506d888560fc97bf22aafc Mon Sep 17 00:00:00 2001
From: Drew Blessing <drew.blessing@me.com>
Date: Mon, 7 Jul 2014 16:21:45 -0500
Subject: Don't use URI join

---
 app/models/user.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/user.rb b/app/models/user.rb
index 6d7350881df..1be3507c2e9 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -470,7 +470,7 @@ class User < ActiveRecord::Base
 
   def avatar_url(size = nil)
     if avatar.present?
-      URI::join(gitlab_config.url, avatar.url).to_s
+      [gitlab_config.url, avatar.url].join("/")
     else
       GravatarService.new.execute(email, size)
     end
-- 
cgit v1.2.1