Merge branch '13806-fix' into 'master'

Add nil check for Gitlab.config.prometheus

Closes #13806

See merge request gitlab-org/gitlab-ce!32201

1 files changed, 11 insertions, 0 deletions

diff --git a/spec/lib/gitlab/database_importers/self_monitoring/project/create_service_spec.rb b/spec/lib/gitlab/database_importers/self_monitoring/project/create_service_spec.rb
index 9bd0d800086..b25f0f6b887 100644
--- a/spec/lib/gitlab/database_importers/self_monitoring/project/create_service_spec.rb
+++ b/spec/lib/gitlab/database_importers/self_monitoring/project/create_service_spec.rb
@@ -197,6 +197,17 @@ describe Gitlab::DatabaseImporters::SelfMonitoring::Project::CreateService do
         end
       end
 
+      context 'when prometheus setting is nil' do
+        before do
+          stub_config(prometheus: nil)
+        end
+
+        it 'does not fail' do
+          expect(result).to include(status: :success)
+          expect(project.prometheus_service).to be_nil
+        end
+      end
+
       context 'when prometheus setting is disabled in gitlab.yml' do
         let(:prometheus_settings) do
           {