diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-02-10 18:34:58 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-02-10 18:34:58 +0000 |
| commit | 6c62ec76c0bc7a15005c8add04dc1700d471b80b (patch) | |
| tree | f52bc7b341dfa9231f7bbaa96b146582cfec67f5 /doc/api | |
| parent | 34c61c8c28001273667578cb7e624b270633f9c0 (diff) | |
| parent | 6fab6d94cef853ed0d081dcea0fbfe390047b1c8 (diff) | |
| download | gitlab-ce-6c62ec76c0bc7a15005c8add04dc1700d471b80b.tar.gz | |
Merge branch '1051-api-create-users-without-password' into 'master'
Optionally make users created via the API set their password
Closes #1051
See merge request !8957
Diffstat (limited to 'doc/api')
| -rw-r--r-- | doc/api/users.md | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/doc/api/users.md b/doc/api/users.md index fea9bdf9639..ed3469521fc 100644 --- a/doc/api/users.md +++ b/doc/api/users.md @@ -216,7 +216,7 @@ Parameters: ## User creation -Creates a new user. Note only administrators can create new users. +Creates a new user. Note only administrators can create new users. Either `password` or `reset_password` should be specified (`reset_password` takes priority). ``` POST /users @@ -225,7 +225,8 @@ POST /users Parameters: - `email` (required) - Email -- `password` (required) - Password +- `password` (optional) - Password +- `reset_password` (optional) - Send user password reset link - true or false(default) - `username` (required) - Username - `name` (required) - Name - `skype` (optional) - Skype ID |