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

Remove unnecessary / from avatar url 

So http://localhost:3000//uploads/user/avatar/1/avatar.png
becomes http://localhost:3000/uploads/user/avatar/1/avatar.png
This commit is contained in:
Hannes Rosenögger 2015-01-19 12:55:05 +01:00
parent 2fba31890e
commit 6bf58e76bd
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/user.rb
View File

@ -497,7 +497,7 @@ class User < ActiveRecord::Base
def avatar_url(size = nil)
if avatar.present?
[gitlab_config.url, avatar.url].join("/")
[gitlab_config.url, avatar.url].join
else
GravatarService.new.execute(email, size)
end

2
spec/helpers/application_helper_spec.rb
View File

@ -73,7 +73,7 @@ describe ApplicationHelper do
user = create(:user)
user.avatar = File.open(avatar_file_path)
user.save!
avatar_icon(user.email).to_s.should match("/gitlab//uploads/user/avatar/#{ user.id }/gitlab_logo.png")
avatar_icon(user.email).to_s.should match("/gitlab/uploads/user/avatar/#{ user.id }/gitlab_logo.png")
end
it "should call gravatar_icon when no avatar is present" do