Move schema aware defaults to build_from_defaults

This way we can reuse the safe setting

2 files changed, 7 insertions, 9 deletions

diff --git a/app/models/concerns/cacheable_attributes.rb b/app/models/concerns/cacheable_attributes.rb
index 75592bb63e2..3d60f6924c1 100644
--- a/app/models/concerns/cacheable_attributes.rb
+++ b/app/models/concerns/cacheable_attributes.rb
@@ -23,7 +23,12 @@ module CacheableAttributes
     end
 
     def build_from_defaults(attributes = {})
-      new(defaults.merge(attributes))
+      final_attributes = defaults
+        .merge(attributes)
+        .stringify_keys
+        .slice(*column_names)
+
+      new(final_attributes)
     end
 
     def cached
diff --git a/lib/gitlab/current_settings.rb b/lib/gitlab/current_settings.rb
index 168542f77e6..570bfb80fba 100644
--- a/lib/gitlab/current_settings.rb
+++ b/lib/gitlab/current_settings.rb
@@ -47,14 +47,7 @@ module Gitlab
         # defaults for missing columns.
         if ActiveRecord::Migrator.needs_migration?
           db_attributes = current_settings&.attributes || {}
-          column_names = ::ApplicationSetting.column_names
-          final_attributes = ::ApplicationSetting
-            .defaults
-            .merge(db_attributes)
-            .stringify_keys
-            .slice(*column_names)
-
-          ::ApplicationSetting.new(final_attributes)
+          ::ApplicationSetting.build_from_defaults(db_attributes)
         elsif current_settings.present?
           current_settings
         else