kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Don't use URI join

Browse source
This commit is contained in:
Drew Blessing 2014-07-07 16:21:45 -05:00
parent 3cb99017c7
commit fe1553e943
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/models/user.rb
View file

@ -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