Merge branch 'fix/avatar_relative_url' into 'master'

Fix Avatar and Relative URL Fixes https://github.com/gitlabhq/gitlabhq/issues/7270 Instead of `URI::join` use a simple join with a slash. This is how all other places in GitLab join URLs and it doesn't muck with the relative path. See merge request !144

Merge branch 'fix/avatar_relative_url' into 'master'
72f50fcb · Dmitriy Zaporozhets · 6a10e2e5 · fe1553e9 · 72f50fcb
Commit 72f50fcb authored Jul 21, 2014 by Dmitriy Zaporozhets
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

user.rb app/models/user.rb +1 -1

No files found.
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -471,7 +471,7 @@ class User < ActiveRecord::Base

  def avatar_url(size = nil)
    if avatar.present?
-      URI::join(gitlab_config.url, avatar.url).to_s
+      [gitlab_config.url, avatar.url].join("/")
    else
      GravatarService.new.execute(email, size)
    end