#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.
This commit is contained in:
		
							parent
							
								
									632c27802c
								
							
						
					
					
						commit
						2765b5c7cf
					
				
					 2 changed files with 2 additions and 2 deletions
				
			
		| 
						 | 
				
			
			@ -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 {
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -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 {
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		
		Reference in a new issue