Don't use URI join

fe1553e9 · Drew Blessing · 3cb99017 · fe1553e9
Commit fe1553e9 authored Jul 07, 2014 by Drew Blessing
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

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

No files found.
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -470,7 +470,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