diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-01-21 20:04:35 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-01-21 20:04:35 +0000 |
| commit | 8a66a10c2a13463e5889bb1503bc84a300b13f6a (patch) | |
| tree | 0bc2878ddca51674ac165f0de9c12b785cfd12cc /app | |
| parent | 2395b8f079fdd3f82428fd6f71221f57614cd226 (diff) | |
| parent | 6bf58e76bd9b74239b668f09c1c38e89d5e53f11 (diff) | |
| download | gitlab-ce-8a66a10c2a13463e5889bb1503bc84a300b13f6a.tar.gz | |
Merge branch 'fix_avatar_url' into 'master'
Remove unnecessary / from avatar url
## What does this MR do?
This MR removes the unecessary / from the avatar url.
## What Use Case does this MR solve?
The // in the url cold lead to avatars not being displayed (reported on IRC)
With this MR the avatar url changes from
http://localhost:3000//uploads/user/avatar/1/gitlab_logo.png
to
http://localhost:3000/uploads/user/avatar/1/gitlab_logo.png
@dblessing Can you take a look?
See merge request !303
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/user.rb | 2 |
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 |