Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
heptapod
heptapod
Commits
8540bccc11cc
Unverified
Commit
d5f70604
authored
Mar 06, 2017
by
Kamil Trzcinski
Browse files
Rename `/take` to `/take_ownership`, expose `owner` in `v3`.
parent
6836e4538dfb
Changes
4
Hide whitespace changes
Inline
Side-by-side
doc/api/pipeline_triggers.md
View file @
8540bccc
...
...
@@ -128,7 +128,7 @@ curl --request PUT --header "PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK" --form descrip
Update an owner of a project trigger.
```
POST /projects/:id/triggers/:trigger_id/take
POST /projects/:id/triggers/:trigger_id/take
_ownership
```
| Attribute | Type | required | Description |
...
...
@@ -136,7 +136,7 @@ POST /projects/:id/triggers/:trigger_id/take
|
`trigger_id`
| integer | yes | The trigger id |
```
curl --request POST --header "PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK" "https://gitlab.example.com/api/v4/projects/1/triggers/10/take"
curl --request POST --header "PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK" "https://gitlab.example.com/api/v4/projects/1/triggers/10/take
_ownership
"
```
```
json
...
...
lib/api/triggers.rb
View file @
8540bccc
...
...
@@ -114,7 +114,7 @@ class Triggers < Grape::API
params
do
requires
:trigger_id
,
type:
Integer
,
desc:
'The trigger ID'
end
post
':id/triggers/:trigger_id/take'
do
post
':id/triggers/:trigger_id/take
_ownership
'
do
authenticate!
authorize!
:admin_build
,
user_project
...
...
lib/api/v3/entities.rb
View file @
8540bccc
...
...
@@ -189,6 +189,7 @@ class Environment < ::API::Entities::EnvironmentBasic
class
Trigger
<
Grape
::
Entity
expose
:token
,
:created_at
,
:updated_at
,
:deleted_at
,
:last_used
expose
:owner
,
using:
Entities
::
UserBasic
end
class
TriggerRequest
<
Grape
::
Entity
...
...
spec/requests/api/triggers_spec.rb
View file @
8540bccc
...
...
@@ -238,12 +238,12 @@
end
end
describe
'POST /projects/:id/triggers/:trigger_id/take'
do
describe
'POST /projects/:id/triggers/:trigger_id/take
_ownership
'
do
context
'authenticated user with valid permissions'
do
it
'updates owner'
do
expect
(
trigger
.
owner
).
to
be_nil
post
api
(
"/projects/
#{
project
.
id
}
/triggers/
#{
trigger
.
id
}
/take"
,
user
)
post
api
(
"/projects/
#{
project
.
id
}
/triggers/
#{
trigger
.
id
}
/take
_ownership
"
,
user
)
expect
(
response
).
to
have_http_status
(
200
)
expect
(
json_response
).
to
include
(
'owner'
)
...
...
@@ -253,7 +253,7 @@
context
'authenticated user with invalid permissions'
do
it
'does not update owner'
do
post
api
(
"/projects/
#{
project
.
id
}
/triggers/
#{
trigger
.
id
}
/take"
,
user2
)
post
api
(
"/projects/
#{
project
.
id
}
/triggers/
#{
trigger
.
id
}
/take
_ownership
"
,
user2
)
expect
(
response
).
to
have_http_status
(
403
)
end
...
...
@@ -261,7 +261,7 @@
context
'unauthenticated user'
do
it
'does not update owner'
do
post
api
(
"/projects/
#{
project
.
id
}
/triggers/
#{
trigger
.
id
}
/take"
)
post
api
(
"/projects/
#{
project
.
id
}
/triggers/
#{
trigger
.
id
}
/take
_ownership
"
)
expect
(
response
).
to
have_http_status
(
401
)
end
...
...
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