Commit 236e1369 authored by Phil Hughes's avatar Phil Hughes

Merge branch 'health-check-scb' into 'master'

Resolve CE/EE diffs in health check

Closes #10489

See merge request gitlab-org/gitlab-ee!12629
parents d8b10fe1 3edb888d
...@@ -23,9 +23,7 @@ ...@@ -23,9 +23,7 @@
%code= liveness_url(token: Gitlab::CurrentSettings.health_check_access_token) %code= liveness_url(token: Gitlab::CurrentSettings.health_check_access_token)
%li %li
%code= metrics_url(token: Gitlab::CurrentSettings.health_check_access_token) %code= metrics_url(token: Gitlab::CurrentSettings.health_check_access_token)
- if Gitlab::Geo.secondary? = render_if_exists 'admin/health_check/health_check_url'
%li
%code= health_check_url(token: Gitlab::CurrentSettings.health_check_access_token, checks: :geo)
%hr %hr
.card .card
.card-header .card-header
......
- if Gitlab::Geo.secondary?
%li
%code= health_check_url(token: Gitlab::CurrentSettings.health_check_access_token, checks: :geo)
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment