Commit fe1553e9 authored by Drew Blessing's avatar Drew Blessing

Don't use URI join

parent 3cb99017
...@@ -470,7 +470,7 @@ class User < ActiveRecord::Base ...@@ -470,7 +470,7 @@ class User < ActiveRecord::Base
def avatar_url(size = nil) def avatar_url(size = nil)
if avatar.present? if avatar.present?
URI::join(gitlab_config.url, avatar.url).to_s [gitlab_config.url, avatar.url].join("/")
else else
GravatarService.new.execute(email, size) GravatarService.new.execute(email, size)
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment