summaryrefslogtreecommitdiff
path: root/spec/factories/ci
diff options
context:
space:
mode:
authorKamil Trzcinski <ayufan@ayufan.eu>2017-01-24 21:52:54 +0100
committerKamil Trzcinski <ayufan@ayufan.eu>2017-01-24 21:52:54 +0100
commitac92554dfc25fc8129b1972da9a385af8d8b733f (patch)
tree14edbdb3f0479d8fad44e18eecebdc10285ffaee /spec/factories/ci
parentb7f4553e3e4681d5a4a53af35650bcbb1c83b390 (diff)
parent8c9a06c37c4cf9763b3781d7e567a7b442c2152c (diff)
downloadgitlab-ce-ac92554dfc25fc8129b1972da9a385af8d8b733f.tar.gz
Merge remote-tracking branch 'origin/master' into backport-ee-changes-for-build-minutes
Diffstat (limited to 'spec/factories/ci')
-rw-r--r--spec/factories/ci/stages.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/spec/factories/ci/stages.rb b/spec/factories/ci/stages.rb
index ee3b17b8bf1..7f557b25ccb 100644
--- a/spec/factories/ci/stages.rb
+++ b/spec/factories/ci/stages.rb
@@ -3,11 +3,12 @@ FactoryGirl.define do
transient do
name 'test'
status nil
+ warnings nil
pipeline factory: :ci_empty_pipeline
end
initialize_with do
- Ci::Stage.new(pipeline, name: name, status: status)
+ Ci::Stage.new(pipeline, name: name, status: status, warnings: warnings)
end
end
end