Add latest changes from gitlab-org/gitlab@15-5-stable-eev15.5.0-rc42

3 files changed, 20 insertions, 3 deletions

diff --git a/app/models/namespace/aggregation_schedule.rb b/app/models/namespace/aggregation_schedule.rb
index ed61c807519..cd7d4fc409a 100644
--- a/app/models/namespace/aggregation_schedule.rb
+++ b/app/models/namespace/aggregation_schedule.rb
@@ -6,13 +6,20 @@ class Namespace::AggregationSchedule < ApplicationRecord
 
   self.primary_key = :namespace_id
 
-  DEFAULT_LEASE_TIMEOUT = 1.5.hours.to_i
   REDIS_SHARED_KEY = 'gitlab:update_namespace_statistics_delay'
 
   belongs_to :namespace
 
   after_create :schedule_root_storage_statistics
 
+  def self.default_lease_timeout
+    if Feature.enabled?(:remove_namespace_aggregator_delay)
+      30.minutes.to_i
+    else
+      1.hour.to_i
+    end
+  end
+
   def schedule_root_storage_statistics
     run_after_commit_or_now do
       try_obtain_lease do
@@ -20,7 +27,7 @@ class Namespace::AggregationSchedule < ApplicationRecord
           .perform_async(namespace_id)
 
         Namespaces::RootStatisticsWorker
-          .perform_in(DEFAULT_LEASE_TIMEOUT, namespace_id)
+          .perform_in(self.class.default_lease_timeout, namespace_id)
       end
     end
   end
@@ -29,7 +36,7 @@ class Namespace::AggregationSchedule < ApplicationRecord
 
   # Used by ExclusiveLeaseGuard
   def lease_timeout
-    DEFAULT_LEASE_TIMEOUT
+    self.class.default_lease_timeout
   end
 
   # Used by ExclusiveLeaseGuard
diff --git a/app/models/namespace/detail.rb b/app/models/namespace/detail.rb
index dbbf9f4944a..a5643ab9f79 100644
--- a/app/models/namespace/detail.rb
+++ b/app/models/namespace/detail.rb
@@ -1,6 +1,10 @@
 # frozen_string_literal: true
 
 class Namespace::Detail < ApplicationRecord
+  include IgnorableColumns
+
+  ignore_column :free_user_cap_over_limt_notified_at, remove_with: '15.7', remove_after: '2022-11-22'
+
   belongs_to :namespace, inverse_of: :namespace_details
   validates :namespace, presence: true
   validates :description, length: { maximum: 255 }
diff --git a/app/models/namespace/package_setting.rb b/app/models/namespace/package_setting.rb
index 881b2f3acb3..22c3e41ff21 100644
--- a/app/models/namespace/package_setting.rb
+++ b/app/models/namespace/package_setting.rb
@@ -1,9 +1,15 @@
 # frozen_string_literal: true
 
 class Namespace::PackageSetting < ApplicationRecord
+  include CascadingNamespaceSettingAttribute
+
   self.primary_key = :namespace_id
   self.table_name = 'namespace_package_settings'
 
+  cascading_attr :maven_package_requests_forwarding
+  cascading_attr :npm_package_requests_forwarding
+  cascading_attr :pypi_package_requests_forwarding
+
   PackageSettingNotImplemented = Class.new(StandardError)
 
   PACKAGES_WITH_SETTINGS = %w[maven generic].freeze