Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Tatuya Kamada
gitlab-ce
Commits
b939529c
Commit
b939529c
authored
Oct 21, 2016
by
Airat Shigapov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix wrong endpoint in api/users documentation, fix same typo in spec describe blocks
parent
6c09fbd8
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
doc/api/users.md
doc/api/users.md
+1
-1
spec/requests/api/users_spec.rb
spec/requests/api/users_spec.rb
+3
-3
No files found.
doc/api/users.md
View file @
b939529c
...
@@ -643,7 +643,7 @@ Parameters:
...
@@ -643,7 +643,7 @@ Parameters:
|
`id`
| integer | yes | The ID of the user |
|
`id`
| integer | yes | The ID of the user |
```
bash
```
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/user
s
/:id/events
```
```
Example response:
Example response:
...
...
spec/requests/api/users_spec.rb
View file @
b939529c
...
@@ -846,7 +846,7 @@ describe API::API, api: true do
...
@@ -846,7 +846,7 @@ describe API::API, api: true do
end
end
end
end
describe
'PUT /user/:id/block'
do
describe
'PUT /user
s
/:id/block'
do
before
{
admin
}
before
{
admin
}
it
'blocks existing user'
do
it
'blocks existing user'
do
put
api
(
"/users/
#{
user
.
id
}
/block"
,
admin
)
put
api
(
"/users/
#{
user
.
id
}
/block"
,
admin
)
...
@@ -873,7 +873,7 @@ describe API::API, api: true do
...
@@ -873,7 +873,7 @@ describe API::API, api: true do
end
end
end
end
describe
'PUT /user/:id/unblock'
do
describe
'PUT /user
s
/:id/unblock'
do
let
(
:blocked_user
)
{
create
(
:user
,
state:
'blocked'
)
}
let
(
:blocked_user
)
{
create
(
:user
,
state:
'blocked'
)
}
before
{
admin
}
before
{
admin
}
...
@@ -914,7 +914,7 @@ describe API::API, api: true do
...
@@ -914,7 +914,7 @@ describe API::API, api: true do
end
end
end
end
describe
'GET /user/:id/events'
do
describe
'GET /user
s
/:id/events'
do
let
(
:user
)
{
create
(
:user
)
}
let
(
:user
)
{
create
(
:user
)
}
let
(
:project
)
{
create
(
:empty_project
)
}
let
(
:project
)
{
create
(
:empty_project
)
}
let
(
:note
)
{
create
(
:note_on_issue
,
note:
'What an awesome day!'
,
project:
project
)
}
let
(
:note
)
{
create
(
:note_on_issue
,
note:
'What an awesome day!'
,
project:
project
)
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment