Add latest changes from gitlab-org/gitlab@master

2 files changed, 17 insertions, 11 deletions

diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb
index 71ca09717d9..34b5b637422 100644
--- a/app/models/ci/build.rb
+++ b/app/models/ci/build.rb
@@ -172,8 +172,6 @@ module Ci
 
     add_authentication_token_field :token, encrypted: :required
 
-    before_save :ensure_token, unless: :assign_token_on_scheduling?
-
     after_save :stick_build_if_status_changed
 
     after_create unless: :importing? do |build|
@@ -247,11 +245,8 @@ module Ci
         !build.waiting_for_deployment_approval? # If false is returned, it stops the transition
       end
 
-      before_transition any => [:pending] do |build, transition|
-        if build.assign_token_on_scheduling?
-          build.ensure_token
-        end
-
+      before_transition any => [:pending] do |build|
+        build.ensure_token
         true
       end
 
@@ -1140,10 +1135,6 @@ module Ci
       end
     end
 
-    def assign_token_on_scheduling?
-      ::Feature.enabled?(:ci_assign_job_token_on_scheduling, project)
-    end
-
     protected
 
     def run_status_commit_hooks!
diff --git a/app/models/ci/sources/pipeline.rb b/app/models/ci/sources/pipeline.rb
index 2df504cd3de..855e68d1db1 100644
--- a/app/models/ci/sources/pipeline.rb
+++ b/app/models/ci/sources/pipeline.rb
@@ -3,6 +3,7 @@
 module Ci
   module Sources
     class Pipeline < Ci::ApplicationRecord
+      include Ci::Partitionable
       include Ci::NamespacedModelName
 
       self.table_name = "ci_sources_pipelines"
@@ -15,6 +16,11 @@ module Ci
       belongs_to :source_bridge, class_name: "Ci::Bridge", foreign_key: :source_job_id
       belongs_to :source_pipeline, class_name: "Ci::Pipeline", foreign_key: :source_pipeline_id
 
+      partitionable scope: :pipeline
+
+      before_validation :set_source_partition_id, on: :create
+      validates :source_partition_id, presence: true
+
       validates :project, presence: true
       validates :pipeline, presence: true
 
@@ -23,6 +29,15 @@ module Ci
       validates :source_pipeline, presence: true
 
       scope :same_project, -> { where(arel_table[:source_project_id].eq(arel_table[:project_id])) }
+
+      private
+
+      def set_source_partition_id
+        return if source_partition_id_changed? && source_partition_id.present?
+        return unless source_job
+
+        self.source_partition_id = source_job.partition_id
+      end
     end
   end
 end