summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorHannes Rosenögger <123haynes@gmail.com>2015-01-19 12:55:05 +0100
committerHannes Rosenögger <123haynes@gmail.com>2015-01-19 14:08:06 +0100
commit6bf58e76bd9b74239b668f09c1c38e89d5e53f11 (patch)
tree36fefc09197dda83dc3c2d9d5dd78fb8eca80e20 /app
parent2fba31890e922fa8bae61e7aa3f21c5b4314e735 (diff)
downloadgitlab-ce-6bf58e76bd9b74239b668f09c1c38e89d5e53f11.tar.gz
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
Diffstat (limited to 'app')
-rw-r--r--app/models/user.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/user.rb b/app/models/user.rb
index 743410c22e3..06521d9fd5c 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