diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-16 06:09:12 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-16 06:09:12 +0000 |
| commit | 8dadd2eab8edd2354272e1d675171a789ad4233f (patch) | |
| tree | fe9c325610893f9a26c23e7287a5ddc6041e1683 /app/services/ci | |
| parent | cf1d4237a4f226ba2deed26240544da0675a41e5 (diff) | |
| download | gitlab-ce-8dadd2eab8edd2354272e1d675171a789ad4233f.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 |
1 files changed, 1 insertions, 5 deletions
diff --git a/app/services/ci/create_cross_project_pipeline_service.rb b/app/services/ci/create_cross_project_pipeline_service.rb index dd15fa8ddb8..8de72ace261 100644 --- a/app/services/ci/create_cross_project_pipeline_service.rb +++ b/app/services/ci/create_cross_project_pipeline_service.rb @@ -18,7 +18,7 @@ module Ci current_user, pipeline_params.fetch(:target_revision)) - downstream_pipeline = service.execute( + service.execute( pipeline_params.fetch(:source), pipeline_params[:execute_params]) do |pipeline| @bridge.sourced_pipelines.build( source_pipeline: @bridge.pipeline, @@ -28,10 +28,6 @@ module Ci pipeline.variables.build(@bridge.downstream_variables) end - - downstream_pipeline.tap do |pipeline| - @bridge.drop!(:downstream_pipeline_creation_failed) if pipeline.errors.any? - end end private |