Add latest changes from gitlab-org/gitlab@12-10-stable-ee

2 files changed, 16 insertions, 2 deletions

diff --git a/spec/factories/ci/bridge.rb b/spec/factories/ci/bridge.rb
index bacf163896c..4c1d5f07a42 100644
--- a/spec/factories/ci/bridge.rb
+++ b/spec/factories/ci/bridge.rb
@@ -7,7 +7,7 @@ FactoryBot.define do
     stage_idx { 0 }
     ref { 'master' }
     tag { false }
-    created_at { 'Di 29. Okt 09:50:00 CET 2013' }
+    created_at { '2013-10-29 09:50:00 CET' }
     status { :created }
     scheduling_type { 'stage' }
 
@@ -39,5 +39,19 @@ FactoryBot.define do
         )
       end
     end
+
+    trait :started do
+      started_at { '2013-10-29 09:51:28 CET' }
+    end
+
+    trait :finished do
+      started
+      finished_at { '2013-10-29 09:53:28 CET' }
+    end
+
+    trait :failed do
+      finished
+      status { 'failed' }
+    end
   end
 end
diff --git a/spec/factories/ci/job_artifacts.rb b/spec/factories/ci/job_artifacts.rb
index a259c5142fc..82383cfa2b0 100644
--- a/spec/factories/ci/job_artifacts.rb
+++ b/spec/factories/ci/job_artifacts.rb
@@ -13,7 +13,7 @@ FactoryBot.define do
     end
 
     trait :remote_store do
-      file_store { JobArtifactUploader::Store::REMOTE }
+      file_store { JobArtifactUploader::Store::REMOTE}
     end
 
     after :build do |artifact|