diff options
| author | blackst0ne <blackst0ne.ru@gmail.com> | 2017-08-09 11:42:59 +1100 |
|---|---|---|
| committer | blackst0ne <blackst0ne.ru@gmail.com> | 2017-08-09 11:42:59 +1100 |
| commit | 67ea6abd07ec525a23818d9736939ccba6c96a2c (patch) | |
| tree | a920404fd11125ce33f66db6ea83dbf50a27cf34 | |
| parent | 8d2099cd8ab02209a0c7aeccc43ecba57a07ae2a (diff) | |
| download | gitlab-ce-67ea6abd07ec525a23818d9736939ccba6c96a2c.tar.gz | |
Use full path of user's avatar in webhooks34339-user_avatar-url-in-push-event-webhook-json-payload-is-relative-should-be-absolute
| -rw-r--r-- | app/models/user.rb | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/34339-user_avatar-url-in-push-event-webhook-json-payload-is-relative-should-be-absolute.yml | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index 43973425a4b..5d8672d60b3 100644 --- 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 diff --git 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 new file mode 100644 index 00000000000..13f28da8577 --- /dev/null +++ b/changelogs/unreleased/34339-user_avatar-url-in-push-event-webhook-json-payload-is-relative-should-be-absolute.yml @@ -0,0 +1,4 @@ +--- +title: Use full path of user's avatar in webhooks +merge_request: 13401 +author: Vitaliy @blackst0ne Klachkov |