diff options
| author | Clement Ho <ClemMakesApps@gmail.com> | 2018-02-07 12:45:37 -0600 |
|---|---|---|
| committer | Clement Ho <ClemMakesApps@gmail.com> | 2018-02-07 12:45:37 -0600 |
| commit | a0c0ea655a8659bb1388a6ffc6738754c1c0f9bd (patch) | |
| tree | bdf8ca27712e033802868fc09533381484f641ae /spec/controllers/health_controller_spec.rb | |
| parent | 48c78958e31c666fcba0b253104d47be5b3c82b0 (diff) | |
| parent | 8900b23eab6abd5a6c01278fa0da18d5bed98491 (diff) | |
| download | gitlab-ce-axios-profile.tar.gz | |
Merge branch 'master' into axios-profileaxios-profile
Diffstat (limited to 'spec/controllers/health_controller_spec.rb')
| -rw-r--r-- | spec/controllers/health_controller_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/controllers/health_controller_spec.rb b/spec/controllers/health_controller_spec.rb index 95946def5f9..542eddc2d16 100644 --- a/spec/controllers/health_controller_spec.rb +++ b/spec/controllers/health_controller_spec.rb @@ -4,7 +4,7 @@ describe HealthController do include StubENV let(:json_response) { JSON.parse(response.body) } - let(:token) { current_application_settings.health_check_access_token } + let(:token) { Gitlab::CurrentSettings.health_check_access_token } let(:whitelisted_ip) { '127.0.0.1' } let(:not_whitelisted_ip) { '127.0.0.2' } |