Add latest changes from gitlab-org/gitlab@15-8-stable-eev15.8.0-rc42

1 files changed, 7 insertions, 10 deletions

diff --git a/app/models/application_setting.rb b/app/models/application_setting.rb
index 3fb1f58f3e0..59ad0650eb3 100644
--- a/app/models/application_setting.rb
+++ b/app/models/application_setting.rb
@@ -35,6 +35,7 @@ class ApplicationSetting < ApplicationRecord
   belongs_to :instance_group, class_name: "Group", foreign_key: 'instance_administrators_group_id'
   alias_attribute :instance_group_id, :instance_administrators_group_id
   alias_attribute :instance_administrators_group, :instance_group
+  alias_attribute :housekeeping_optimize_repository_period, :housekeeping_incremental_repack_period
 
   sanitizes! :default_branch_name
 
@@ -256,18 +257,10 @@ class ApplicationSetting < ApplicationRecord
             presence: { message: 'Domain denylist cannot be empty if denylist is enabled.' },
             if: :domain_denylist_enabled?
 
-  validates :housekeeping_incremental_repack_period,
+  validates :housekeeping_optimize_repository_period,
             presence: true,
             numericality: { only_integer: true, greater_than: 0 }
 
-  validates :housekeeping_full_repack_period,
-            presence: true,
-            numericality: { only_integer: true, greater_than_or_equal_to: :housekeeping_incremental_repack_period }
-
-  validates :housekeeping_gc_period,
-            presence: true,
-            numericality: { only_integer: true, greater_than_or_equal_to: :housekeeping_full_repack_period }
-
   validates :terminal_max_session_time,
             presence: true,
             numericality: { only_integer: true, greater_than_or_equal_to: 0 }
@@ -413,7 +406,7 @@ class ApplicationSetting < ApplicationRecord
   validates :invisible_captcha_enabled,
             inclusion: { in: [true, false], message: N_('must be a boolean value') }
 
-  validates :invitation_flow_enforcement, :can_create_group,
+  validates :invitation_flow_enforcement, :can_create_group, :user_defaults_to_private_profile,
             allow_nil: false,
             inclusion: { in: [true, false], message: N_('must be a boolean value') }
 
@@ -694,6 +687,10 @@ class ApplicationSetting < ApplicationRecord
             allow_nil: false,
             inclusion: { in: [true, false], message: N_('must be a boolean value') }
 
+  validates :allow_runner_registration_token,
+            allow_nil: false,
+            inclusion: { in: [true, false], message: N_('must be a boolean value') }
+
   before_validation :ensure_uuid!
   before_validation :coerce_repository_storages_weighted, if: :repository_storages_weighted_changed?
   before_validation :normalize_default_branch_name