kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Fix docs

Browse source
This commit is contained in:
Douwe Maan 2015-07-30 11:41:59 +02:00
parent 4fb6ddfe06
commit 1c7a8b8c27
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
doc/api/users.md
View file

@ -434,9 +434,9 @@ Parameters:
- `uid` (required) - id of specified user - `uid` (required) - id of specified user
## Single SSH key ## Single email
Get a single key. Get a single email.
``` ```
GET /user/emails/:id GET /user/emails/:id
@ -444,7 +444,7 @@ GET /user/emails/:id
Parameters: Parameters:
- `id` (required) - The ID of an SSH key - `id` (required) - email ID
```json ```json
{ {
@ -472,7 +472,7 @@ Parameters:
} }
``` ```
Will return created key with status `201 Created` on success. If an Will return created email with status `201 Created` on success. If an
error occurs a `400 Bad Request` is returned with a message explaining the error: error occurs a `400 Bad Request` is returned with a message explaining the error:
```json ```json
@ -498,7 +498,7 @@ Parameters:
- `id` (required) - id of specified user - `id` (required) - id of specified user
- `email` (required) - email address - `email` (required) - email address
Will return created key with status `201 Created` on success, or `404 Not found` on fail. Will return created email with status `201 Created` on success, or `404 Not found` on fail.
## Delete email for current user ## Delete email for current user
@ -527,7 +527,7 @@ Parameters:
- `uid` (required) - id of specified user - `uid` (required) - id of specified user
- `id` (required) - email ID - `id` (required) - email ID
Will return `200 OK` on success, or `404 Not found` if either user or key cannot be found. Will return `200 OK` on success, or `404 Not found` if either user or email cannot be found.
## Block user ## Block user

2
spec/requests/api/users_spec.rb
View file

@ -389,7 +389,7 @@ describe API::API, api: true do
before { admin } before { admin }
it "should not create invalid email" do it "should not create invalid email" do
post api("/users/#{user.id}/emails", admin), { } post api("/users/#{user.id}/emails", admin), {}
expect(response.status).to eq(400) expect(response.status).to eq(400)
expect(json_response['message']).to eq('400 (Bad request) "email" not given') expect(json_response['message']).to eq('400 (Bad request) "email" not given')
end end