diff options
author | DJ Mountney <david@twkie.net> | 2016-05-11 17:27:08 -0700 |
---|---|---|
committer | DJ Mountney <david@twkie.net> | 2016-05-11 17:27:08 -0700 |
commit | c8f23bd2edc19f968446b149120df1f7798eb4b1 (patch) | |
tree | 1b922eff4ebae5350ce4d44417877ef05993bfa1 /config | |
parent | 0e0caf4d17c28b6b0f3488b25efa265ce2804cc4 (diff) | |
download | gitlab-ce-c8f23bd2edc19f968446b149120df1f7798eb4b1.tar.gz |
Support token header for health check token, and general cleanup of the health_check feature.
Diffstat (limited to 'config')
-rw-r--r-- | config/initializers/health_check.rb | 2 | ||||
-rw-r--r-- | config/routes.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/config/initializers/health_check.rb b/config/initializers/health_check.rb index a93e4273030..79e2d23ab2e 100644 --- a/config/initializers/health_check.rb +++ b/config/initializers/health_check.rb @@ -1,3 +1,3 @@ HealthCheck.setup do |config| - config.standard_checks = [ 'database', 'migrations', 'cache' ] + config.standard_checks = ['database', 'migrations', 'cache'] end diff --git a/config/routes.rb b/config/routes.rb index c81bf294a53..f794a881f71 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -74,7 +74,7 @@ Rails.application.routes.draw do end # Health check - get 'health_check(/:checks)(.:format)' => 'health_check#index' + get 'health_check(/:checks)' => 'health_check#index', as: :health_check # Enable Grack support mount Grack::AuthSpawner, at: '/', constraints: lambda { |request| /[-\/\w\.]+\.git\//.match(request.path_info) }, via: [:get, :post, :put] |