diff options
| author | Matija Čupić <matteeyah@gmail.com> | 2018-02-04 23:38:59 +0100 |
|---|---|---|
| committer | Matija Čupić <matteeyah@gmail.com> | 2018-02-04 23:38:59 +0100 |
| commit | 3366f377c1d4cbb02ecc5a2e47b059ed375c5e09 (patch) | |
| tree | 6a19813b4820ad6d2813bf86b30d8e5be2bd10c6 /spec/controllers/health_check_controller_spec.rb | |
| parent | 0abce36cd20cdd3579138bee835d28519a5593f2 (diff) | |
| parent | cf887a8b3108edb715ee5618377f4ffab1824d85 (diff) | |
| download | gitlab-ce-3366f377c1d4cbb02ecc5a2e47b059ed375c5e09.tar.gz | |
Merge branch 'master' into 38265-stuckcijobsworker-wrongly-detects-cancels-stuck-builds-when-per-job-timeout-is-more-than-an-hour
Diffstat (limited to 'spec/controllers/health_check_controller_spec.rb')
| -rw-r--r-- | spec/controllers/health_check_controller_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/controllers/health_check_controller_spec.rb b/spec/controllers/health_check_controller_spec.rb index 2cead1770c9..387ca46ef6f 100644 --- a/spec/controllers/health_check_controller_spec.rb +++ b/spec/controllers/health_check_controller_spec.rb @@ -5,7 +5,7 @@ describe HealthCheckController do let(:json_response) { JSON.parse(response.body) } let(:xml_response) { Hash.from_xml(response.body)['hash'] } - 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' } |