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 /spec/factories/ci | |
| parent | c0cfc9ebd26583c444f2cce1a23f939bfa7d8969 (diff) | |
| parent | d4f3963e98397a0aee4b7a65c76ae404300b41d1 (diff) | |
Merge branch 'master' into '37970-ci-sections-tracking'
# Conflicts:
# db/schema.rb
Diffstat (limited to 'spec/factories/ci')
| -rw-r--r-- | spec/factories/ci/pipelines.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/spec/factories/ci/pipelines.rb b/spec/factories/ci/pipelines.rb index e5ea6b41ea3..f994c2df821 100644 --- a/spec/factories/ci/pipelines.rb +++ b/spec/factories/ci/pipelines.rb @@ -47,6 +47,7 @@ FactoryGirl.define do trait :invalid do config(rspec: nil) + failure_reason :config_error end trait :blocked do |