diff options
| author | Phil Hughes <me@iamphill.com> | 2019-05-15 10:42:20 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2019-05-15 10:42:20 +0000 |
| commit | 9d5afa1ca247e6fdfa1ee201ea9d0ef3bbdebce1 (patch) | |
| tree | 2057d67ae4e900978c0b5d35c6323c9456f0fcee | |
| parent | e2433d64016c61c7e7e9ac2c04dd2a85c3805ca7 (diff) | |
| parent | e33ab9ef1398c65fea6ed290ce515849757efa85 (diff) | |
| download | gitlab-ce-9d5afa1ca247e6fdfa1ee201ea9d0ef3bbdebce1.tar.gz | |
Merge branch 'health-check-scb' into 'master'
Resolve CE/EE diffs in health check
See merge request gitlab-org/gitlab-ce!28270
| -rw-r--r-- | app/views/admin/health_check/show.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/admin/health_check/show.html.haml b/app/views/admin/health_check/show.html.haml index 0f5e97e288a..ac56e354a4d 100644 --- a/app/views/admin/health_check/show.html.haml +++ b/app/views/admin/health_check/show.html.haml @@ -23,7 +23,7 @@ %code= liveness_url(token: Gitlab::CurrentSettings.health_check_access_token) %li %code= metrics_url(token: Gitlab::CurrentSettings.health_check_access_token) - + = render_if_exists 'admin/health_check/health_check_url' %hr .card .card-header |