Add latest changes from gitlab-org/gitlab@master

1 files changed, 6 insertions, 1 deletions

diff --git a/app/models/commit_status.rb b/app/models/commit_status.rb
index 9f77bd8ebe2..a8e2615b327 100644
--- a/app/models/commit_status.rb
+++ b/app/models/commit_status.rb
@@ -25,11 +25,12 @@ class CommitStatus < Ci::ApplicationRecord
   self.sequence_name = :ci_builds_id_seq
   self.primary_key = :id
 
+  query_constraints :id, :partition_id
   partitionable scope: :pipeline, partitioned: true
 
   belongs_to :user
   belongs_to :project
-  belongs_to :pipeline, class_name: 'Ci::Pipeline', foreign_key: :commit_id, inverse_of: :statuses
+  belongs_to :pipeline, ->(build) { in_partition(build) }, class_name: 'Ci::Pipeline', foreign_key: :commit_id, inverse_of: :statuses, partition_foreign_key: :partition_id
   belongs_to :auto_canceled_by, class_name: 'Ci::Pipeline', inverse_of: :auto_canceled_jobs
   belongs_to :ci_stage, class_name: 'Ci::Stage', foreign_key: :stage_id
 
@@ -233,6 +234,10 @@ class CommitStatus < Ci::ApplicationRecord
     false
   end
 
+  def self.use_partition_id_filter?
+    Ci::Pipeline.use_partition_id_filter?
+  end
+
   def locking_enabled?
     will_save_change_to_status?
   end