summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2016-10-22 03:22:47 +0000
committerRémy Coutable <remy@rymai.me>2016-10-22 03:22:47 +0000
commit77ea6909fa90e40ce2189bd9f2569f0799ddf353 (patch)
tree2cb7567d76e716071191176b93812853a45a33e4
parentbaec0353df64d75455aa90f7f2f6efbf7f2f6920 (diff)
parentb939529c2a2c724f1471ab3b0ec2a5dac10c913c (diff)
downloadgitlab-ce-77ea6909fa90e40ce2189bd9f2569f0799ddf353.tar.gz
Merge branch 'fix-example-in-api-documentation' into 'master'
Fix wrong example in api/users documentation ## What does this MR do? Just a small typo fix in API docs. While greping for this typo I also found couple more places with same mistake and included them in the MR too. See merge request !7043
-rw-r--r--doc/api/users.md2
-rw-r--r--spec/requests/api/users_spec.rb6
2 files changed, 4 insertions, 4 deletions
diff --git a/doc/api/users.md b/doc/api/users.md
index 2b12770d5a5..a50ba5432fe 100644
--- a/doc/api/users.md
+++ b/doc/api/users.md
@@ -643,7 +643,7 @@ Parameters:
| `id` | integer | yes | The ID of the user |
```bash
-curl --header "PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK" https://gitlab.example.com/api/v3/user/:id/events
+curl --header "PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK" https://gitlab.example.com/api/v3/users/:id/events
```
Example response:
diff --git a/spec/requests/api/users_spec.rb b/spec/requests/api/users_spec.rb
index f83f4d2c9b1..d48752473f3 100644
--- a/spec/requests/api/users_spec.rb
+++ b/spec/requests/api/users_spec.rb
@@ -846,7 +846,7 @@ describe API::API, api: true do
end
end
- describe 'PUT /user/:id/block' do
+ describe 'PUT /users/:id/block' do
before { admin }
it 'blocks existing user' do
put api("/users/#{user.id}/block", admin)
@@ -873,7 +873,7 @@ describe API::API, api: true do
end
end
- describe 'PUT /user/:id/unblock' do
+ describe 'PUT /users/:id/unblock' do
let(:blocked_user) { create(:user, state: 'blocked') }
before { admin }
@@ -914,7 +914,7 @@ describe API::API, api: true do
end
end
- describe 'GET /user/:id/events' do
+ describe 'GET /users/:id/events' do
let(:user) { create(:user) }
let(:project) { create(:empty_project) }
let(:note) { create(:note_on_issue, note: 'What an awesome day!', project: project) }