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 /spec/factories | |
| 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 'spec/factories')
| -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 |