diff options
author | Shinya Maeda <shinya@gitlab.com> | 2017-08-28 16:00:11 +0900 |
---|---|---|
committer | Shinya Maeda <shinya@gitlab.com> | 2017-08-29 01:15:21 +0900 |
commit | 815483b389e9b8efb16f94316a1a9425bc27a7a5 (patch) | |
tree | 39bd50f9101541149cab946e4a8193e690567d00 | |
parent | 84ab8a716f2f2739da82c5bafd8f29f2ee7180cb (diff) | |
download | gitlab-ce-815483b389e9b8efb16f94316a1a9425bc27a7a5.tar.gz |
Remove trigger_request.trigger.owner
-rw-r--r-- | app/services/ci/create_pipeline_service.rb | 2 | ||||
-rw-r--r-- | spec/requests/api/triggers_spec.rb | 24 |
2 files changed, 13 insertions, 13 deletions
diff --git a/app/services/ci/create_pipeline_service.rb b/app/services/ci/create_pipeline_service.rb index d0ba9f89460..de2cd7e87be 100644 --- a/app/services/ci/create_pipeline_service.rb +++ b/app/services/ci/create_pipeline_service.rb @@ -15,7 +15,7 @@ module Ci pipeline_schedule: schedule ) - result = validate(current_user || trigger_request.trigger.owner, + result = validate(current_user, ignore_skip_ci: ignore_skip_ci, save_on_errors: save_on_errors) diff --git a/spec/requests/api/triggers_spec.rb b/spec/requests/api/triggers_spec.rb index b5d6b732969..402d1040436 100644 --- a/spec/requests/api/triggers_spec.rb +++ b/spec/requests/api/triggers_spec.rb @@ -84,21 +84,21 @@ describe API::Triggers do expect(pipeline.variables.map { |v| { v.key => v.value } }.last).to eq(variables) end end - end - context 'when legacy trigger' do - before do - trigger.update(owner: nil) - end + context 'when legacy trigger' do + before do + trigger.update(owner: nil) + end - it 'creates pipeline' do - post api("/projects/#{project.id}/trigger/pipeline"), options.merge(ref: 'master') + it 'creates pipeline' do + post api("/projects/#{project.id}/trigger/pipeline"), options.merge(ref: 'master') - expect(response).to have_http_status(201) - expect(json_response).to include('id' => pipeline.id) - pipeline.builds.reload - expect(pipeline.builds.pending.size).to eq(2) - expect(pipeline.builds.size).to eq(5) + expect(response).to have_http_status(201) + expect(json_response).to include('id' => pipeline.id) + pipeline.builds.reload + expect(pipeline.builds.pending.size).to eq(2) + expect(pipeline.builds.size).to eq(5) + end end end |