diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2017-10-06 10:08:00 +0000 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2017-10-06 10:08:00 +0000 |
| commit | 6cd7ce33240f8984f5c835123c5e7a96b4abb167 (patch) | |
| tree | 3dd95fa21ddde156e3c858a84c57f96f0ba577c5 /lib/gitlab | |
| parent | cbc7d62c2982135d5edd8e1ea1c32d35cc60d46f (diff) | |
| parent | 83059f130e9049939e3e8251b7ede5fa128073fd (diff) | |
| download | gitlab-ce-6cd7ce33240f8984f5c835123c5e7a96b4abb167.tar.gz | |
Merge branch 'backstage/gb/move-some-pipelines-code-from-ee-to-ee' into 'master'
Move to CE some EE pipelines-related code that belongs to CE
Closes gitlab-ee#3616
See merge request gitlab-org/gitlab-ce!14699
Diffstat (limited to 'lib/gitlab')
| -rw-r--r-- | lib/gitlab/ci/pipeline/chain/validate/config.rb | 2 | ||||
| -rw-r--r-- | lib/gitlab/ci/stage/seed.rb | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/lib/gitlab/ci/pipeline/chain/validate/config.rb b/lib/gitlab/ci/pipeline/chain/validate/config.rb index 489bcd79655..075504bcce5 100644 --- a/lib/gitlab/ci/pipeline/chain/validate/config.rb +++ b/lib/gitlab/ci/pipeline/chain/validate/config.rb @@ -13,7 +13,7 @@ module Gitlab end if @command.save_incompleted && @pipeline.has_yaml_errors? - @pipeline.drop + @pipeline.drop!(:config_error) end return error(@pipeline.yaml_errors) diff --git a/lib/gitlab/ci/stage/seed.rb b/lib/gitlab/ci/stage/seed.rb index e19aae35a81..bc97aa63b02 100644 --- a/lib/gitlab/ci/stage/seed.rb +++ b/lib/gitlab/ci/stage/seed.rb @@ -3,7 +3,9 @@ module Gitlab module Stage class Seed attr_reader :pipeline + delegate :project, to: :pipeline + delegate :size, to: :@jobs def initialize(pipeline, stage, jobs) @pipeline = pipeline |