diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-09-27 10:10:40 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-09-27 10:10:40 +0000 |
| commit | d5bce06df1ec36371db208d0aaf42d849eb63bcf (patch) | |
| tree | 3edc5cc74bc4b13d0238bc053b85804bc1ea30d6 /doc/api/users.md | |
| parent | babb05a1406d4889f90953bdb16d736b22ce6c21 (diff) | |
| parent | f920d996e34dfb8f8933ff7c5798fa1a72c357b6 (diff) | |
| download | gitlab-ce-d5bce06df1ec36371db208d0aaf42d849eb63bcf.tar.gz | |
Merge branch 'feature/add-public-email-to-users-api' into 'master'
Feature/add public email to users api
Closes #39346
See merge request gitlab-org/gitlab-ce!21909
Diffstat (limited to 'doc/api/users.md')
| -rw-r--r-- | doc/api/users.md | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/doc/api/users.md b/doc/api/users.md index b0ae455a025..762ea53edee 100644 --- a/doc/api/users.md +++ b/doc/api/users.md @@ -199,6 +199,7 @@ Parameters: "created_at": "2012-05-23T08:00:58Z", "bio": null, "location": null, + "public_email": "john@example.com", "skype": "", "linkedin": "", "twitter": "", @@ -230,6 +231,7 @@ Parameters: "is_admin": false, "bio": null, "location": null, + "public_email": "john@example.com", "skype": "", "linkedin": "", "twitter": "", @@ -367,6 +369,7 @@ GET /user "created_at": "2012-05-23T08:00:58Z", "bio": null, "location": null, + "public_email": "john@example.com", "skype": "", "linkedin": "", "twitter": "", @@ -415,6 +418,7 @@ GET /user "is_admin": false, "bio": null, "location": null, + "public_email": "john@example.com", "skype": "", "linkedin": "", "twitter": "", |