diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-02 15:08:01 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-02 15:08:01 +0000 |
| commit | b375c6c05fbd03aea33a9ee9f82e678bdaa8c3cc (patch) | |
| tree | 55f2a32e5fd3d67597fc8c6cc2a01793ee15c87a /app/services/ci | |
| parent | 988b28ec1a379d38f6ac9ed04886ee564fd447fd (diff) | |
| download | gitlab-ce-b375c6c05fbd03aea33a9ee9f82e678bdaa8c3cc.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/services/ci')
| -rw-r--r-- | app/services/ci/create_cross_project_pipeline_service.rb | 6 | ||||
| -rw-r--r-- | app/services/ci/create_pipeline_service.rb | 1 |
2 files changed, 1 insertions, 6 deletions
diff --git a/app/services/ci/create_cross_project_pipeline_service.rb b/app/services/ci/create_cross_project_pipeline_service.rb index 8de72ace261..22b8e37a7e8 100644 --- a/app/services/ci/create_cross_project_pipeline_service.rb +++ b/app/services/ci/create_cross_project_pipeline_service.rb @@ -20,12 +20,6 @@ module Ci service.execute( pipeline_params.fetch(:source), pipeline_params[:execute_params]) do |pipeline| - @bridge.sourced_pipelines.build( - source_pipeline: @bridge.pipeline, - source_project: @bridge.project, - project: @bridge.downstream_project, - pipeline: pipeline) - pipeline.variables.build(@bridge.downstream_variables) end end diff --git a/app/services/ci/create_pipeline_service.rb b/app/services/ci/create_pipeline_service.rb index 52977034b70..347630f865f 100644 --- a/app/services/ci/create_pipeline_service.rb +++ b/app/services/ci/create_pipeline_service.rb @@ -7,6 +7,7 @@ module Ci CreateError = Class.new(StandardError) SEQUENCE = [Gitlab::Ci::Pipeline::Chain::Build, + Gitlab::Ci::Pipeline::Chain::Build::Associations, Gitlab::Ci::Pipeline::Chain::Validate::Abilities, Gitlab::Ci::Pipeline::Chain::Validate::Repository, Gitlab::Ci::Pipeline::Chain::Config::Content, |