diff options
author | Achilleas Pipinellis <axil@gitlab.com> | 2018-09-14 16:46:08 +0300 |
---|---|---|
committer | Achilleas Pipinellis <axil@gitlab.com> | 2018-09-14 16:46:08 +0300 |
commit | 844bb16a66b6aa73491c87276304c6605e8b55fb (patch) | |
tree | adb624f4ec0b322ee9af96863f48a871e864aa29 /doc | |
parent | a3a4a5afede13c69d51536fa4eaeb1977b45a50b (diff) | |
parent | e9aec3a101a714cf7a98dbdb8313c45885c87775 (diff) |
Merge branch 'docs-update-usersapi' into 'master'
Adds a note about the case when reset_password is false
See merge request gitlab-org/gitlab-ce!21738
Diffstat (limited to 'doc')
-rw-r--r-- | doc/api/users.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/api/users.md b/doc/api/users.md index 7fc06d85145..b0ae455a025 100644 --- a/doc/api/users.md +++ b/doc/api/users.md @@ -263,7 +263,7 @@ GET /users/:id?with_custom_attributes=true ## User creation -Creates a new user. Note only administrators can create new users. Either `password` or `reset_password` should be specified (`reset_password` takes priority). +Creates a new user. Note only administrators can create new users. Either `password` or `reset_password` should be specified (`reset_password` takes priority). If `reset_password` is `false`, then `password` is required. ``` POST /users |