diff options
| author | Robert Speicher <robert@gitlab.com> | 2018-01-25 04:26:06 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2018-01-25 04:26:06 +0000 |
| commit | 8f5d1d1371b47ab810a9e5ddff483f669d149363 (patch) | |
| tree | 4e654658c01f6f61941ce94837c6d5c2d0d9b622 /app | |
| parent | db00a135840d0f02672b19dbd5848753051cd72c (diff) | |
| parent | 867126130946a9d3c3da7ff8e64b59b14da13599 (diff) | |
| download | gitlab-ce-8f5d1d1371b47ab810a9e5ddff483f669d149363.tar.gz | |
Merge branch 'sh-add-gitaly-health-check' into 'master'
Add a gRPC health check to ensure Gitaly is up
See merge request gitlab-org/gitlab-ce!16606
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/health_controller.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/controllers/health_controller.rb b/app/controllers/health_controller.rb index a931b456a93..16abf7bab7e 100644 --- a/app/controllers/health_controller.rb +++ b/app/controllers/health_controller.rb @@ -8,7 +8,8 @@ class HealthController < ActionController::Base Gitlab::HealthChecks::Redis::CacheCheck, Gitlab::HealthChecks::Redis::QueuesCheck, Gitlab::HealthChecks::Redis::SharedStateCheck, - Gitlab::HealthChecks::FsShardsCheck + Gitlab::HealthChecks::FsShardsCheck, + Gitlab::HealthChecks::GitalyCheck ].freeze def readiness |