1 files changed, 4 insertions, 1 deletions
diff --git a/app/models/ci/stage.rb b/app/models/ci/stage.rb
index 4f9a2e44562..3a498972153 100644
--- a/app/models/ci/stage.rb
+++ b/app/models/ci/stage.rb
@@ -8,9 +8,12 @@ module Ci
     include Gitlab::OptimisticLocking
     include Presentable
     include SafelyChangeColumnDefault
+    include IgnorableColumns
 
     columns_changing_default :partition_id
 
+    ignore_column :pipeline_id_convert_to_bigint, remove_with: '16.6', remove_after: '2023-10-22'
+
     partitionable scope: :pipeline
 
     enum status: Ci::HasStatus::STATUSES_ENUM
@@ -151,7 +154,7 @@ module Ci
     end
 
     def manual_playable?
-      blocked?
+      blocked? || skipped?
     end
 
     # This will be removed with ci_remove_ensure_stage_service