From d1de6fd4d867ee817a1979e05344e580d33c7759 Mon Sep 17 00:00:00 2001 From: Thong Kuah Date: Wed, 21 Aug 2019 11:59:58 +1200 Subject: [PATCH] Column was renamed in 12.2 --- config/initializers/rest-client-hostname_override.rb | 2 +- spec/initializers/rest-client-hostname_override_spec.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config/initializers/rest-client-hostname_override.rb b/config/initializers/rest-client-hostname_override.rb index bc1b70bd73f..80b123ebe61 100644 --- a/config/initializers/rest-client-hostname_override.rb +++ b/config/initializers/rest-client-hostname_override.rb @@ -40,7 +40,7 @@ module RestClient end def allow_settings_local_requests? - Gitlab::CurrentSettings.allow_local_requests_from_hooks_and_services? + Gitlab::CurrentSettings.allow_local_requests_from_web_hooks_and_services? end end diff --git a/spec/initializers/rest-client-hostname_override_spec.rb b/spec/initializers/rest-client-hostname_override_spec.rb index 1ff82342fb5..3707e001d41 100644 --- a/spec/initializers/rest-client-hostname_override_spec.rb +++ b/spec/initializers/rest-client-hostname_override_spec.rb @@ -101,7 +101,7 @@ describe 'rest-client dns rebinding protection' do context 'when local requests are allowed' do before do - stub_application_setting(allow_local_requests_from_hooks_and_services: true) + stub_application_setting(allow_local_requests_from_web_hooks_and_services: true) end it 'allows an external request' do