diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-10-01 15:13:08 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-10-01 15:13:08 +0000 |
| commit | 051090c804a4808cd43a2e5494fe7cb868314765 (patch) | |
| tree | 61a38fab494aa9c56c09f24e907bc843d16a7bc4 /changelogs | |
| parent | bfeed3b304aa6719b8f823de23f0cbe9712ba7de (diff) | |
| parent | 303350567c7b2bf140fa17d3f3f473ad9ece4e45 (diff) | |
| download | gitlab-ce-051090c804a4808cd43a2e5494fe7cb868314765.tar.gz | |
Merge branch 'feature/set-public-email-through-api' into 'master'
Set public email through api
Closes #37675
See merge request gitlab-org/gitlab-ce!21938
Diffstat (limited to 'changelogs')
| -rw-r--r-- | changelogs/unreleased/feature-set-public-email-through-api.yml | 5 | ||||
| -rw-r--r-- | changelogs/unreleased/fix-add-organization-and-location-to-allowed-parameters.yml | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/changelogs/unreleased/feature-set-public-email-through-api.yml b/changelogs/unreleased/feature-set-public-email-through-api.yml new file mode 100644 index 00000000000..22fae71e9d8 --- /dev/null +++ b/changelogs/unreleased/feature-set-public-email-through-api.yml @@ -0,0 +1,5 @@ +--- +title: Add support for setting the public email through the api +merge_request: 21938 +author: Alexis Reigel +type: added diff --git a/changelogs/unreleased/fix-add-organization-and-location-to-allowed-parameters.yml b/changelogs/unreleased/fix-add-organization-and-location-to-allowed-parameters.yml new file mode 100644 index 00000000000..4d85e1b9af2 --- /dev/null +++ b/changelogs/unreleased/fix-add-organization-and-location-to-allowed-parameters.yml @@ -0,0 +1,5 @@ +--- +title: Allow setting user's organization and location attributes through the API by adding them to the list of allowed parameters +merge_request: 21938 +author: Alexis Reigel +type: fixed |