diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2017-10-07 11:07:33 +0300 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2017-10-07 11:07:33 +0300 |
| commit | 5ee20b637553dcb70590edfa30b81d972de37170 (patch) | |
| tree | 7079e097120fc25438b411c6162a1ae81656c129 /lib/gitlab/ci | |
| parent | c0cfc9ebd26583c444f2cce1a23f939bfa7d8969 (diff) | |
| parent | d4f3963e98397a0aee4b7a65c76ae404300b41d1 (diff) | |
Merge branch 'master' into '37970-ci-sections-tracking'
# Conflicts:
# db/schema.rb
Diffstat (limited to 'lib/gitlab/ci')
| -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 |