Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLin Jen-Shin <godfat@godfat.org>2017-06-06 18:52:57 +0300
committerLin Jen-Shin <godfat@godfat.org>2017-06-06 18:52:57 +0300
commit6d17ddac5aaf6c178a13c1e371b072780e7fd049 (patch)
treeba1b8990e7272a47af035d0e024e95e6d544eed7 /app/services/ci/create_pipeline_service.rb
parente86e1e515a7a4e4e1ee53d3d33bdfebfddd226a6 (diff)
Still allow legacy triggers, feedback:
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/11910#note_31632911
Diffstat (limited to 'app/services/ci/create_pipeline_service.rb')
-rw-r--r--app/services/ci/create_pipeline_service.rb8
1 files changed, 3 insertions, 5 deletions
diff --git a/app/services/ci/create_pipeline_service.rb b/app/services/ci/create_pipeline_service.rb
index b3dbb548454..7efea564ba6 100644
--- a/app/services/ci/create_pipeline_service.rb
+++ b/app/services/ci/create_pipeline_service.rb
@@ -23,10 +23,6 @@ module Ci
return error('Insufficient permissions to create a new pipeline')
end
- if trigger_request && !trigger_request.trigger.owner
- return error('Legacy trigger without a owner is not allowed')
- end
-
unless branch? || tag?
return error('Reference not found')
end
@@ -63,7 +59,9 @@ module Ci
def triggering_user_allowed_for_ref?(trigger_request, ref)
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
def process!