diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-12-21 15:15:58 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-12-21 15:15:58 +0300 |
| commit | 2779809e45970e7660521b94dbebcf24ed00d60d (patch) | |
| tree | 98df2ede3cb2bdcb42955e5c4684dd70a8a79c81 /app | |
| parent | 4ecd816dcbbf2c3a83087ea1add13f087530e9eb (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/ci/pipeline_chat_data.rb | 4 | ||||
| -rw-r--r-- | app/models/ci/stage.rb | 3 | ||||
| -rw-r--r-- | app/models/concerns/ci/partitionable/testing.rb | 1 |
3 files changed, 5 insertions, 3 deletions
diff --git a/app/models/ci/pipeline_chat_data.rb b/app/models/ci/pipeline_chat_data.rb index ba20c993e36..d4f38b556b7 100644 --- a/app/models/ci/pipeline_chat_data.rb +++ b/app/models/ci/pipeline_chat_data.rb @@ -2,14 +2,18 @@ module Ci class PipelineChatData < Ci::ApplicationRecord + include Ci::Partitionable include Ci::NamespacedModelName self.table_name = 'ci_pipeline_chat_data' belongs_to :chat_name + belongs_to :pipeline validates :pipeline_id, presence: true validates :chat_name_id, presence: true validates :response_url, presence: true + + partitionable scope: :pipeline end end diff --git a/app/models/ci/stage.rb b/app/models/ci/stage.rb index becb8f204bf..ba1a0a46247 100644 --- a/app/models/ci/stage.rb +++ b/app/models/ci/stage.rb @@ -7,9 +7,6 @@ module Ci include Ci::HasStatus include Gitlab::OptimisticLocking include Presentable - include IgnorableColumns - - ignore_column :pipeline_id_convert_to_bigint, remove_with: '16.6', remove_after: '2023-10-22' partitionable scope: :pipeline diff --git a/app/models/concerns/ci/partitionable/testing.rb b/app/models/concerns/ci/partitionable/testing.rb index b961d72db94..cea46e9f1b6 100644 --- a/app/models/concerns/ci/partitionable/testing.rb +++ b/app/models/concerns/ci/partitionable/testing.rb @@ -21,6 +21,7 @@ module Ci Ci::PendingBuild Ci::RunningBuild Ci::RunnerManagerBuild + Ci::PipelineChatData Ci::PipelineVariable Ci::Sources::Pipeline Ci::Stage |