From fc3d214130f2038b3c8bdf142506c9116f373244 Mon Sep 17 00:00:00 2001 From: Grzegorz Bizon Date: Tue, 29 May 2018 15:20:10 +0200 Subject: Add a feature flag for switching pipeline stages --- app/models/ci/pipeline.rb | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'app/models/ci/pipeline.rb') diff --git a/app/models/ci/pipeline.rb b/app/models/ci/pipeline.rb index 9dac56fcd57..4b8c23a393d 100644 --- a/app/models/ci/pipeline.rb +++ b/app/models/ci/pipeline.rb @@ -250,13 +250,17 @@ module Ci end ## - # TODO consider switching to persisted stages only in pipelines table - # (not necessairly in the show pipeline page because of #23257. - # Hide this behind two feature flags - enabled / disabled and only - # gitlab-ce / everywhere. + # TODO We do not completely switch to persisted stages because of + # race conditions with setting statuses gitlab-ce#23257. # - def stages - super + def ordered_stages + return legacy_stages unless complete? + + if Feature.enabled?('ci_pipeline_persisted_stages') + stages + else + legacy_stages + end end def legacy_stages -- cgit v1.2.1