Go-Gitea
/
gitea
mirror of https://github.com/go-gitea/gitea.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

#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.
pull/197/head
Unknwon 2016-02-15 15:18:53 -05:00
parent 632c27802c
commit 2765b5c7cf
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
models/action.go
View File

@ -498,7 +498,7 @@ func CommitRepoAction(
payloadSender := &api.PayloadUser{ payloadSender := &api.PayloadUser{
UserName: pusher.Name, UserName: pusher.Name,
ID: pusher.Id, ID: pusher.Id,
AvatarUrl: setting.AppUrl + pusher.RelAvatarLink(), AvatarUrl: pusher.AvatarLink(),
} }
switch opType { switch opType {

2
routers/repo/webhook.go
View File

@ -364,7 +364,7 @@ func TestWebhook(ctx *middleware.Context) {
Sender: &api.PayloadUser{ Sender: &api.PayloadUser{
UserName: ctx.User.Name, UserName: ctx.User.Name,
ID: ctx.User.Id, 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 { if err := models.PrepareWebhooks(ctx.Repo.Repository, models.HOOK_EVENT_PUSH, p); err != nil {