diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-10 18:09:50 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-10 18:09:50 +0300 |
| commit | de2fb5b82c92c90f90ed67ced45143c04e934fb8 (patch) | |
| tree | ff8e5e642580de7bb596d90dd0e7f739f44ca540 /app/views/clusters | |
| parent | c6a33b298229f9e04933be43d6176c476ef03012 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/clusters')
| -rw-r--r-- | app/views/clusters/clusters/show.html.haml | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/app/views/clusters/clusters/show.html.haml b/app/views/clusters/clusters/show.html.haml index 8797178f920..7fc76880480 100644 --- a/app/views/clusters/clusters/show.html.haml +++ b/app/views/clusters/clusters/show.html.haml @@ -41,7 +41,12 @@ .js-serverless-survey-banner{ data: { user_name: current_user.name, user_email: current_user.email } } - %h4= @cluster.name + .d-flex.my-3 + %p.badge.badge-light.p-2.mr-2 + = cluster_type_label(@cluster.cluster_type) + %h4.m-0 + = @cluster.name + = render 'banner' - if cluster_created?(@cluster) @@ -56,7 +61,3 @@ .tab-content.py-3 .tab-pane.active{ role: 'tabpanel' } = render_cluster_info_tab_content(params[:tab], expanded_by_default?) - - - - |