Commit 1de1608a authored by Douglas Barbosa Alexandre's avatar Douglas Barbosa Alexandre
Browse files

Merge branch 'ce-reduce-diff-in-pipeline_trigger_service' into 'master'

Reduce diff with EE in Ci::PipelineTriggerService

See merge request gitlab-org/gitlab-ce!24866
parents b49563c3 5791aa86
......@@ -7,6 +7,8 @@ class PipelineTriggerService < BaseService
def execute
if trigger_from_token
create_pipeline_from_trigger(trigger_from_token)
elsif job_from_token
create_pipeline_from_job(job_from_token)
end
end
......@@ -35,6 +37,14 @@ def trigger_from_token
end
end
def create_pipeline_from_job(job)
# overriden in EE
end
def job_from_token
# overriden in EE
end
def variables
params[:variables].to_h.map do |key, value|
{ key: key, value: value }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment