1 files changed, 15 insertions, 0 deletions
diff --git a/spec/lib/gitlab/current_settings_spec.rb b/spec/lib/gitlab/current_settings_spec.rb
index 73540a9b0f3..fda3b07eb82 100644
--- a/spec/lib/gitlab/current_settings_spec.rb
+++ b/spec/lib/gitlab/current_settings_spec.rb
@@ -179,6 +179,21 @@ RSpec.describe Gitlab::CurrentSettings do
           expect(settings).to have_attributes(settings_from_defaults)
         end
 
+        context 'when we hit a recursive loop' do
+          before do
+            expect(ApplicationSetting).to receive(:create_from_defaults) do
+              raise ApplicationSetting::Recursion
+            end
+          end
+
+          it 'recovers and returns in-memory settings' do
+            settings = described_class.current_application_settings
+
+            expect(settings).to be_a(ApplicationSetting)
+            expect(settings).not_to be_persisted
+          end
+        end
+
         context 'when ApplicationSettings does not have a primary key' do
           before do
             allow(ApplicationSetting.connection).to receive(:primary_key).with('application_settings').and_return(nil)