summaryrefslogtreecommitdiff
path: root/spec/factories
diff options
context:
space:
mode:
authorKamil Trzciński <ayufan@ayufan.eu>2017-01-23 14:32:06 +0000
committerKamil Trzciński <ayufan@ayufan.eu>2017-01-23 14:32:06 +0000
commit7446c2f5cf7aaf9ebc323232064bf4bc6360b644 (patch)
tree8857423eecd369b41143118eff4313f9ae4f1fcd /spec/factories
parent1a8647f5939998288c4f2076d340099cd178e23d (diff)
parent86217866fda66cb770ee8c9a540bf535a980eb36 (diff)
downloadgitlab-ce-7446c2f5cf7aaf9ebc323232064bf4bc6360b644.tar.gz
Merge branch 'feature/success-warning-icons-in-stages-builds' into 'master'
Use a warning icon for a stage with allowed to fail builds Closes #21948 See merge request !8503
Diffstat (limited to 'spec/factories')
-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