kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Still allow legacy triggers, feedback:

Browse source 
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/11910#note_31632911
This commit is contained in:
Lin Jen-Shin 2017-06-06 23:52:57 +08:00
parent e86e1e515a
commit 6d17ddac5a
2 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/services/ci/create_pipeline_service.rb
View file

@ -23,10 +23,6 @@ module Ci
return error('Insufficient permissions to create a new pipeline') return error('Insufficient permissions to create a new pipeline')
end end
if trigger_request && !trigger_request.trigger.owner
return error('Legacy trigger without a owner is not allowed')
end
unless branch? || tag? unless branch? || tag?
return error('Reference not found') return error('Reference not found')
end end
@ -63,7 +59,9 @@ module Ci
def triggering_user_allowed_for_ref?(trigger_request, ref) def triggering_user_allowed_for_ref?(trigger_request, ref)
triggering_user = current_user || trigger_request.trigger.owner triggering_user = current_user || trigger_request.trigger.owner
Ci::Pipeline.allowed_to_create?(triggering_user, project, ref) (triggering_user &&
Ci::Pipeline.allowed_to_create?(triggering_user, project, ref)) ||
!project.protected_for?(ref)
end end
def process! def process!

6
spec/services/ci/create_pipeline_service_spec.rb
View file

@ -415,10 +415,10 @@ describe Ci::CreatePipelineService, services: true do
let(:user) {} let(:user) {}
let(:trigger_request) { create(:ci_trigger_request) } let(:trigger_request) { create(:ci_trigger_request) }
it 'does not create a pipeline' do it 'creates a pipeline' do
expect(execute_service(trigger_request: trigger_request)) expect(execute_service(trigger_request: trigger_request))
.not_to be_persisted .to be_persisted
expect(Ci::Pipeline.count).to eq(0) expect(Ci::Pipeline.count).to eq(1)
end end
end end
end end