diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-07-11 11:51:27 +0300 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-07-11 11:51:27 +0300 |
| commit | 25d241ae97e22159bf71caa5553eb192fdb6d4c0 (patch) | |
| tree | 078cd9c6ca7c26433768dfe6ff1927bbda47ae0b /app/controllers/health_controller.rb | |
| parent | b39c98371de5b1f070b682984d1e01847b49f77a (diff) | |
| parent | 063f03b9d7c6f53def50f337e3da24585d1a837a (diff) | |
Merge branch '33949-remove-healthcheck-access-token' into 'master'
Remove the need to use health check token by adding ability to whitelist hosts
Closes #33949
See merge request !12612
Diffstat (limited to 'app/controllers/health_controller.rb')
| -rw-r--r-- | app/controllers/health_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/health_controller.rb b/app/controllers/health_controller.rb index 3dbacbbc897..98c2aaa3526 100644 --- a/app/controllers/health_controller.rb +++ b/app/controllers/health_controller.rb @@ -1,6 +1,6 @@ class HealthController < ActionController::Base protect_from_forgery with: :exception - include RequiresHealthToken + include RequiresWhitelistedMonitoringClient CHECKS = [ Gitlab::HealthChecks::DbCheck, |