Add latest changes from gitlab-org/gitlab@master

11 files changed, 42 insertions, 27 deletions

diff --git a/app/models/bulk_imports/entity.rb b/app/models/bulk_imports/entity.rb
index a7e57b60936..6fc24c77f1d 100644
--- a/app/models/bulk_imports/entity.rb
+++ b/app/models/bulk_imports/entity.rb
@@ -39,9 +39,28 @@ class BulkImports::Entity < ApplicationRecord
 
   validates :project, absence: true, if: :group
   validates :group, absence: true, if: :project
-  validates :source_type, :source_full_path, :destination_name, presence: true
-  validates :destination_namespace, exclusion: [nil], if: :group
-  validates :destination_namespace, presence: true, if: :project
+  validates :source_type, presence: true
+  validates :source_full_path,
+            presence: true,
+            format: { with: Gitlab::Regex.bulk_import_source_full_path_regex,
+                      message: Gitlab::Regex.bulk_import_destination_namespace_path_regex_message }
+
+  validates :destination_name,
+            presence: true,
+            format: { with: Gitlab::Regex.group_path_regex,
+                      message: Gitlab::Regex.group_path_regex_message }
+
+  validates :destination_namespace,
+            exclusion: [nil],
+            format: { with: Gitlab::Regex.bulk_import_destination_namespace_path_regex,
+                      message: Gitlab::Regex.bulk_import_destination_namespace_path_regex_message },
+            if: :group
+
+  validates :destination_namespace,
+            presence: true,
+            format: { with: Gitlab::Regex.bulk_import_destination_namespace_path_regex,
+                      message: Gitlab::Regex.bulk_import_destination_namespace_path_regex_message },
+            if: :project
 
   validate :validate_parent_is_a_group, if: :parent
   validate :validate_imported_entity_type
diff --git a/app/models/commit.rb b/app/models/commit.rb
index a95ab756600..4517b3ef216 100644
--- a/app/models/commit.rb
+++ b/app/models/commit.rb
@@ -501,8 +501,8 @@ class Commit
     end
   end
 
-  def raw_diffs(*args)
-    raw.diffs(*args)
+  def raw_diffs(...)
+    raw.diffs(...)
   end
 
   def raw_deltas
diff --git a/app/models/compare.rb b/app/models/compare.rb
index f594a796987..f03390334f4 100644
--- a/app/models/compare.rb
+++ b/app/models/compare.rb
@@ -79,8 +79,8 @@ class Compare
     commit&.sha
   end
 
-  def raw_diffs(*args)
-    @compare.diffs(*args)
+  def raw_diffs(...)
+    @compare.diffs(...)
   end
 
   def diffs(diff_options = nil)
diff --git a/app/models/concerns/integrations/has_web_hook.rb b/app/models/concerns/integrations/has_web_hook.rb
index e622faf4a51..dcf14a4c7dc 100644
--- a/app/models/concerns/integrations/has_web_hook.rb
+++ b/app/models/concerns/integrations/has_web_hook.rb
@@ -42,9 +42,9 @@ module Integrations
     end
 
     # Execute the webhook, creating it if necessary.
-    def execute_web_hook!(*args)
+    def execute_web_hook!(...)
       update_web_hook!
-      service_hook.execute(*args)
+      service_hook.execute(...)
     end
   end
 end
diff --git a/app/models/concerns/noteable.rb b/app/models/concerns/noteable.rb
index eed396f785b..ec0dccc8d1a 100644
--- a/app/models/concerns/noteable.rb
+++ b/app/models/concerns/noteable.rb
@@ -123,10 +123,10 @@ module Noteable
     notes.limit(max).count
   end
 
-  def grouped_diff_discussions(*args)
+  def grouped_diff_discussions(...)
     # Doesn't use `discussion_notes`, because this may include commit diff notes
     # besides MR diff notes, that we do not want to display on the MR Changes tab.
-    notes.inc_relations_for_view(self).grouped_diff_discussions(*args)
+    notes.inc_relations_for_view(self).grouped_diff_discussions(...)
   end
 
   # rubocop:disable Gitlab/ModuleWithInstanceVariables
diff --git a/app/models/concerns/reactive_caching.rb b/app/models/concerns/reactive_caching.rb
index 9ed2070d11c..aa0fced99c4 100644
--- a/app/models/concerns/reactive_caching.rb
+++ b/app/models/concerns/reactive_caching.rb
@@ -122,8 +122,8 @@ module ReactiveCaching
       worker_class.perform_async(self.class, id, *args)
     end
 
-    def keep_alive_reactive_cache!(*args)
-      Rails.cache.write(alive_reactive_cache_key(*args), true, expires_in: self.class.reactive_cache_lifetime)
+    def keep_alive_reactive_cache!(...)
+      Rails.cache.write(alive_reactive_cache_key(...), true, expires_in: self.class.reactive_cache_lifetime)
     end
 
     def full_reactive_cache_key(*qualifiers)
@@ -145,8 +145,8 @@ module ReactiveCaching
       Gitlab::ExclusiveLease.cancel(full_reactive_cache_key(*args), uuid)
     end
 
-    def within_reactive_cache_lifetime?(*args)
-      Rails.cache.exist?(alive_reactive_cache_key(*args))
+    def within_reactive_cache_lifetime?(...)
+      Rails.cache.exist?(alive_reactive_cache_key(...))
     end
 
     def enqueuing_update(*args)
diff --git a/app/models/group.rb b/app/models/group.rb
index f48484f04f7..a2d984973bd 100644
--- a/app/models/group.rb
+++ b/app/models/group.rb
@@ -913,10 +913,6 @@ class Group < Namespace
     feature_flag_enabled_for_self_or_ancestor?(:work_items_mvc_2)
   end
 
-  def work_items_create_from_markdown_feature_flag_enabled?
-    feature_flag_enabled_for_self_or_ancestor?(:work_items_create_from_markdown)
-  end
-
   def usage_quotas_enabled?
     ::Feature.enabled?(:usage_quotas_for_all_editions, self) && root?
   end
diff --git a/app/models/legacy_diff_discussion.rb b/app/models/legacy_diff_discussion.rb
index 7d78c580fa2..984205044a7 100644
--- a/app/models/legacy_diff_discussion.rb
+++ b/app/models/legacy_diff_discussion.rb
@@ -27,10 +27,10 @@ class LegacyDiffDiscussion < Discussion
     true
   end
 
-  def active?(*args)
+  def active?(...)
     return @active if @active.present?
 
-    @active = first_note.active?(*args)
+    @active = first_note.active?(...)
   end
 
   def collapsed?
diff --git a/app/models/merge_request/metrics.rb b/app/models/merge_request/metrics.rb
index c546a5a0025..87d8704561f 100644
--- a/app/models/merge_request/metrics.rb
+++ b/app/models/merge_request/metrics.rb
@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 class MergeRequest::Metrics < ApplicationRecord
+  include IgnorableColumns
+
   belongs_to :merge_request, inverse_of: :metrics
   belongs_to :pipeline, class_name: 'Ci::Pipeline', foreign_key: :pipeline_id
   belongs_to :latest_closed_by, class_name: 'User'
@@ -14,6 +16,8 @@ class MergeRequest::Metrics < ApplicationRecord
   scope :with_valid_time_to_merge, -> { where(arel_table[:merged_at].gt(arel_table[:created_at])) }
   scope :by_target_project, ->(project) { where(target_project_id: project) }
 
+  ignore_column :id_convert_to_bigint, remove_with: '16.0', remove_after: '2023-05-22'
+
   class << self
     def time_to_merge_expression
       Arel.sql('EXTRACT(epoch FROM SUM(AGE(merge_request_metrics.merged_at, merge_request_metrics.created_at)))')
diff --git a/app/models/project.rb b/app/models/project.rb
index 8c931310614..a4fa20b227e 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -3064,10 +3064,6 @@ class Project < ApplicationRecord
     group&.work_items_mvc_2_feature_flag_enabled? || Feature.enabled?(:work_items_mvc_2)
   end
 
-  def work_items_create_from_markdown_feature_flag_enabled?
-    group&.work_items_create_from_markdown_feature_flag_enabled? || Feature.enabled?(:work_items_create_from_markdown)
-  end
-
   def enqueue_record_project_target_platforms
     return unless Gitlab.com?
     return unless Feature.enabled?(:record_projects_target_platforms, self)
diff --git a/app/models/repository.rb b/app/models/repository.rb
index 4100218944f..f71d7bb8d20 100644
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -888,8 +888,8 @@ class Repository
     end
   end
 
-  def delete_refs(*ref_names)
-    raw.delete_refs(*ref_names)
+  def delete_refs(...)
+    raw.delete_refs(...)
   end
 
   def ff_merge(user, source, target_branch, merge_request: nil)