Return avatar link as absolute url (#3235)

Fixes relative urls coming from api/v1

See https://github.com/drone/drone/issues/1701

diff --git a/models/user.go b/models/user.go
index f4c5b669c27d75e297f92e74ff17a77115647104..20b122d779bae26d3d5d0d327a0a32df67b1eb33 100644 (file)
--- a/models/user.go
+++ b/models/user.go
@@ -263,11 +263,11 @@ func (u *User) RelAvatarLink() string {
        return setting.GravatarSource + u.Avatar
 }
 
-// AvatarLink returns user gravatar link.
+// AvatarLink returns user avatar link.
 func (u *User) AvatarLink() string {
        link := u.RelAvatarLink()
        if link[0] == '/' && link[1] != '/' {
-               return setting.AppSubUrl + link
+               return strings.TrimSuffix(setting.AppUrl, "/") + link
        }
        return link
 }