From 2765b5c7cf6fa234fd86a14ee50597f8ed841c18 Mon Sep 17 00:00:00 2001
From: Unknwon <u@gogs.io>
Date: Mon, 15 Feb 2016 15:18:53 -0500
Subject: [PATCH] #2630 fix wrong user avatar link in webhook

Was using the wrong method and now uses the method which checks if
the avatar link is relative or not.
---
 models/action.go        | 2 +-
 routers/repo/webhook.go | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/models/action.go b/models/action.go
index 8d7dd6fa3d..3bcf999d9f 100644
--- a/models/action.go
+++ b/models/action.go
@@ -498,7 +498,7 @@ func CommitRepoAction(
 	payloadSender := &api.PayloadUser{
 		UserName:  pusher.Name,
 		ID:        pusher.Id,
-		AvatarUrl: setting.AppUrl + pusher.RelAvatarLink(),
+		AvatarUrl: pusher.AvatarLink(),
 	}
 
 	switch opType {
diff --git a/routers/repo/webhook.go b/routers/repo/webhook.go
index 458670ad2f..a1b3633043 100644
--- a/routers/repo/webhook.go
+++ b/routers/repo/webhook.go
@@ -364,7 +364,7 @@ func TestWebhook(ctx *middleware.Context) {
 		Sender: &api.PayloadUser{
 			UserName:  ctx.User.Name,
 			ID:        ctx.User.Id,
-			AvatarUrl: setting.AppUrl + ctx.User.RelAvatarLink(),
+			AvatarUrl: ctx.User.AvatarLink(),
 		},
 	}
 	if err := models.PrepareWebhooks(ctx.Repo.Repository, models.HOOK_EVENT_PUSH, p); err != nil {