From 6bf58e76bd9b74239b668f09c1c38e89d5e53f11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hannes=20Rosen=C3=B6gger?= <123haynes@gmail.com> Date: Mon, 19 Jan 2015 12:55:05 +0100 Subject: [PATCH] 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 --- app/models/user.rb | 2 +- spec/helpers/application_helper_spec.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/models/user.rb b/app/models/user.rb index 743410c22e..06521d9fd5 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -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 diff --git a/spec/helpers/application_helper_spec.rb b/spec/helpers/application_helper_spec.rb index 9cdbc846b1..1738f3443c 100644 --- a/spec/helpers/application_helper_spec.rb +++ b/spec/helpers/application_helper_spec.rb @@ -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