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
Jérome Perrin
gitlab-ce
Commits
815483b3
Commit
815483b3
authored
Aug 28, 2017
by
Shinya Maeda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove trigger_request.trigger.owner
parent
84ab8a71
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
13 deletions
+13
-13
app/services/ci/create_pipeline_service.rb
app/services/ci/create_pipeline_service.rb
+1
-1
spec/requests/api/triggers_spec.rb
spec/requests/api/triggers_spec.rb
+12
-12
No files found.
app/services/ci/create_pipeline_service.rb
View file @
815483b3
...
@@ -15,7 +15,7 @@ module Ci
...
@@ -15,7 +15,7 @@ module Ci
pipeline_schedule:
schedule
pipeline_schedule:
schedule
)
)
result
=
validate
(
current_user
||
trigger_request
.
trigger
.
owner
,
result
=
validate
(
current_user
,
ignore_skip_ci:
ignore_skip_ci
,
ignore_skip_ci:
ignore_skip_ci
,
save_on_errors:
save_on_errors
)
save_on_errors:
save_on_errors
)
...
...
spec/requests/api/triggers_spec.rb
View file @
815483b3
...
@@ -84,21 +84,21 @@ describe API::Triggers do
...
@@ -84,21 +84,21 @@ describe API::Triggers do
expect
(
pipeline
.
variables
.
map
{
|
v
|
{
v
.
key
=>
v
.
value
}
}.
last
).
to
eq
(
variables
)
expect
(
pipeline
.
variables
.
map
{
|
v
|
{
v
.
key
=>
v
.
value
}
}.
last
).
to
eq
(
variables
)
end
end
end
end
end
context
'when legacy trigger'
do
context
'when legacy trigger'
do
before
do
before
do
trigger
.
update
(
owner:
nil
)
trigger
.
update
(
owner:
nil
)
end
end
it
'creates pipeline'
do
it
'creates pipeline'
do
post
api
(
"/projects/
#{
project
.
id
}
/trigger/pipeline"
),
options
.
merge
(
ref:
'master'
)
post
api
(
"/projects/
#{
project
.
id
}
/trigger/pipeline"
),
options
.
merge
(
ref:
'master'
)
expect
(
response
).
to
have_http_status
(
201
)
expect
(
response
).
to
have_http_status
(
201
)
expect
(
json_response
).
to
include
(
'id'
=>
pipeline
.
id
)
expect
(
json_response
).
to
include
(
'id'
=>
pipeline
.
id
)
pipeline
.
builds
.
reload
pipeline
.
builds
.
reload
expect
(
pipeline
.
builds
.
pending
.
size
).
to
eq
(
2
)
expect
(
pipeline
.
builds
.
pending
.
size
).
to
eq
(
2
)
expect
(
pipeline
.
builds
.
size
).
to
eq
(
5
)
expect
(
pipeline
.
builds
.
size
).
to
eq
(
5
)
end
end
end
end
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