diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-08-09 08:08:52 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-08-09 08:08:52 +0000 |
| commit | 932a6e69b882334dd7e8fdf158ebbab4c620a2b5 (patch) | |
| tree | 0e67c52cf0128edbccdfb65fd2284a340b3692f4 | |
| parent | 0ff90166ff607fc8fb71d4b7312457be7941be78 (diff) | |
| parent | 67ea6abd07ec525a23818d9736939ccba6c96a2c (diff) | |
| download | gitlab-ce-932a6e69b882334dd7e8fdf158ebbab4c620a2b5.tar.gz | |
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
| -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 |