提交 6d17ddac 编写于 作者: L Lin Jen-Shin
上级 e86e1e51
...@@ -23,10 +23,6 @@ module Ci ...@@ -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 ...@@ -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!
......
...@@ -415,10 +415,10 @@ describe Ci::CreatePipelineService, services: true do ...@@ -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
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册