Merge branch…

Merge branch '34339-user_avatar-url-in-push-event-webhook-json-payload-is-relative-should-be-absolute' into 'master' Resolve "user_avatar URL in push event webhook JSON payload is relative, should be absolute" Closes #34339 See merge request !13401

Merge branch…
932a6e69 · Rémy Coutable · 0ff90166 · 67ea6abd · 932a6e69 · 932a6e69
Commit 932a6e69 authored Aug 09, 2017 by Rémy Coutable
Showing with 5 additions and 1 deletion

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

34339-user_avatar-url-in-push-event-webhook-json-payload-is-relative-should-be-absolute.yml ...t-webhook-json-payload-is-relative-should-be-absolute.yml +4 -0

No files found.
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -825,7 +825,7 @@ class User < ActiveRecord::Base
    {
      name: name,
      username: username,
-      avatar_url: avatar_url
+      avatar_url: avatar_url(only_path: false)
    }
  end

--- a/changelogs/unreleased/34339-user_avatar-url-in-push-event-webhook-json-payload-is-relative-should-be-absolute.yml
+++ b/changelogs/unreleased/34339-user_avatar-url-in-push-event-webhook-json-payload-is-relative-should-be-absolute.yml
+---
+title: Use full path of user's avatar in webhooks
+merge_request: 13401
+author: Vitaliy @blackst0ne Klachkov