Add latest changes from gitlab-org/gitlab@13-7-stable-eev13.7.0-rc42

1 files changed, 8 insertions, 0 deletions

diff --git a/config/settings.rb b/config/settings.rb
index c681fa32491..3369f2a4480 100644
--- a/config/settings.rb
+++ b/config/settings.rb
@@ -152,6 +152,14 @@ class Settings < Settingslogic
       Gitlab::Application.secrets.db_key_base
     end
 
+    def encrypted(path)
+      Gitlab::EncryptedConfiguration.new(
+        content_path: path,
+        base_key: Gitlab::Application.secrets.encrypted_settings_key_base,
+        previous_keys: Gitlab::Application.secrets.rotated_encrypted_settings_key_base || []
+      )
+    end
+
     def load_dynamic_cron_schedules!
       cron_jobs['gitlab_usage_ping_worker']['cron'] ||= cron_for_usage_ping
     end