diff options
| author | Thong Kuah <tkuah@gitlab.com> | 2019-08-21 11:59:58 +1200 |
|---|---|---|
| committer | Thong Kuah <tkuah@gitlab.com> | 2019-08-21 14:28:15 +1200 |
| commit | f77d170b0bb122c34d98d1e0c8152345d5cad90a (patch) | |
| tree | c219a60ecb691a7dcc774c07a967e666541b3c45 | |
| parent | c3cdafdb7e520f2e8e205f87cf977dc8560f7a2a (diff) | |
| download | gitlab-ce-f77d170b0bb122c34d98d1e0c8152345d5cad90a.tar.gz | |
Column was renamed in 12.2
| -rw-r--r-- | config/initializers/rest-client-hostname_override.rb | 2 | ||||
| -rw-r--r-- | 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 |