summaryrefslogtreecommitdiff
path: root/config/routes.rb
diff options
context:
space:
mode:
authorLuke Bennett <lbennett@gitlab.com>2018-07-31 16:29:13 +0000
committerLuke Bennett <lbennett@gitlab.com>2018-07-31 16:29:13 +0000
commit1b27c45753a55eaba3c935138da65e3e7ff105eb (patch)
tree8637500714bde29bacd50b76bc977636362dbf32 /config/routes.rb
parent9eb87018b2659b07d5ee9c72a214987c86eca8cb (diff)
parent1a95603510accdcdb233fa00f101da119eb1fa5c (diff)
downloadgitlab-ce-1b27c45753a55eaba3c935138da65e3e7ff105eb.tar.gz
Merge branch 'master' into '41416-making-instance-wide-data-tools-more-accessible'
# Conflicts: # app/models/application_setting.rb # lib/api/settings.rb
Diffstat (limited to 'config/routes.rb')
-rw-r--r--config/routes.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/config/routes.rb b/config/routes.rb
index 63e40a31b76..d16a587c5ee 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -46,6 +46,7 @@ Rails.application.routes.draw do
get 'health_check(/:checks)' => 'health_check#index', as: :health_check
scope path: '-' do
+ # '/-/health' implemented by BasicHealthMiddleware
get 'liveness' => 'health#liveness'
get 'readiness' => 'health#readiness'
post 'storage_check' => 'health#storage_check'