diff options
| author | Phil Hughes <me@iamphill.com> | 2019-03-19 20:36:37 +0300 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2019-03-19 20:36:37 +0300 |
| commit | 934253c9475a2f2d8a562bcc6bbb8a5f52efa713 (patch) | |
| tree | 4aaae89d51281ada85cf7cc8cce200d91fc1f25a /app/views/clusters | |
| parent | aba47db0ba2a451df3713ab326d36bd0afde3984 (diff) | |
| parent | b18644cb55561d022765ac174aaa19d19c9628f6 (diff) | |
Merge branch '6354-clusters-show' into 'master'
Removes EE differences for clusters/show
Closes gitlab-ee#6354
See merge request gitlab-org/gitlab-ce!26324
Diffstat (limited to 'app/views/clusters')
| -rw-r--r-- | app/views/clusters/clusters/show.html.haml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/views/clusters/clusters/show.html.haml b/app/views/clusters/clusters/show.html.haml index 884fa323093..68d9510e1bf 100644 --- a/app/views/clusters/clusters/show.html.haml +++ b/app/views/clusters/clusters/show.html.haml @@ -34,6 +34,8 @@ = render 'banner' = render 'form' + = render_if_exists 'health' + .cluster-applications-table#js-cluster-applications %section.settings#js-cluster-details{ class: ('expanded' if expanded) } |