diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-08-18 13:50:51 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-08-18 13:50:51 +0300 |
commit | db384e6b19af03b4c3c82a5760d83a3fd79f7982 (patch) | |
tree | 34beaef37df5f47ccbcf5729d7583aae093cffa0 /app/models/ci/stage.rb | |
parent | 54fd7b1bad233e3944434da91d257fa7f63c3996 (diff) |
Add latest changes from gitlab-org/gitlab@16-3-stable-eev16.3.0-rc42
Diffstat (limited to 'app/models/ci/stage.rb')
-rw-r--r-- | app/models/ci/stage.rb | 5 |
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 |