Add latest changes from gitlab-org/gitlab@master

3 files changed, 9 insertions, 0 deletions

diff --git a/app/models/ci/instance_variable.rb b/app/models/ci/instance_variable.rb
index 179befb8469..6a2fb1132c0 100644
--- a/app/models/ci/instance_variable.rb
+++ b/app/models/ci/instance_variable.rb
@@ -13,6 +13,7 @@ module Ci
 
     alias_attribute :secret_value, :value
 
+    validates :description, length: { maximum: 255 }, allow_blank: true
     validates :key, uniqueness: {
       message: -> (object, data) { _("(%{value}) has already been taken") }
     }
diff --git a/app/models/ci/pipeline_artifact.rb b/app/models/ci/pipeline_artifact.rb
index 6d22a875aab..e0e6906f211 100644
--- a/app/models/ci/pipeline_artifact.rb
+++ b/app/models/ci/pipeline_artifact.rb
@@ -4,6 +4,7 @@
 
 module Ci
   class PipelineArtifact < Ci::ApplicationRecord
+    include Ci::Partitionable
     include UpdateProjectStatistics
     include Artifactable
     include FileStoreMounter
@@ -31,6 +32,8 @@ module Ci
     validates :size, presence: true, numericality: { less_than_or_equal_to: FILE_SIZE_LIMIT }
     validates :file_type, presence: true
 
+    partitionable scope: :pipeline
+
     mount_file_store_uploader Ci::PipelineArtifactUploader
 
     update_project_statistics project_statistics_name: :pipeline_artifacts_size
diff --git a/app/models/ci/pipeline_metadata.rb b/app/models/ci/pipeline_metadata.rb
index a41cdf61b71..21d102374f0 100644
--- a/app/models/ci/pipeline_metadata.rb
+++ b/app/models/ci/pipeline_metadata.rb
@@ -2,6 +2,9 @@
 
 module Ci
   class PipelineMetadata < Ci::ApplicationRecord
+    include Ci::Partitionable
+    include Importable
+
     self.primary_key = :pipeline_id
 
     enum auto_cancel_on_new_commit: {
@@ -21,5 +24,7 @@ module Ci
     validates :pipeline, presence: true
     validates :project, presence: true
     validates :name, length: { minimum: 1, maximum: 255 }, allow_nil: true
+
+    partitionable scope: :pipeline
   end
 end