diff options
author | Phil Hughes <me@iamphill.com> | 2018-02-06 15:57:48 +0000 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2018-02-06 15:57:48 +0000 |
commit | ba62493009c2360018709b660956a6173f3e1515 (patch) | |
tree | 623ba15e0bb0a07f1483b38ca8e10ec41d702a14 /app/views/layouts | |
parent | 805799b71b059b1bfb3578c4e78db3030ec04b6a (diff) | |
parent | 0ecd759d73abaee5c08adbd8ab3db651c2522b14 (diff) | |
download | gitlab-ce-ba62493009c2360018709b660956a6173f3e1515.tar.gz |
Merge branch 'winh-kubernetes-clusters' into 'master'
Replace "cluster" with "Kubernetes cluster"
Closes #41963
See merge request gitlab-org/gitlab-ce!16778
Diffstat (limited to 'app/views/layouts')
-rw-r--r-- | app/views/layouts/nav/sidebar/_project.html.haml | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/app/views/layouts/nav/sidebar/_project.html.haml b/app/views/layouts/nav/sidebar/_project.html.haml index e20e58d27e1..2b98cb9de99 100644 --- a/app/views/layouts/nav/sidebar/_project.html.haml +++ b/app/views/layouts/nav/sidebar/_project.html.haml @@ -186,9 +186,9 @@ - if project_nav_tab? :clusters - show_cluster_hint = show_gke_cluster_integration_callout?(@project) = nav_link(controller: [:clusters, :user, :gcp]) do - = link_to project_clusters_path(@project), title: 'Cluster', class: 'shortcuts-cluster' do + = link_to project_clusters_path(@project), title: _('Kubernetes'), class: 'shortcuts-cluster' do %span - Clusters + = _('Kubernetes') - if show_cluster_hint .feature-highlight.js-feature-highlight{ disabled: true, data: { trigger: 'manual', @@ -206,13 +206,12 @@ %p = _('Protip:') = link_to 'Auto DevOps', help_page_path('topics/autodevops/index.md') - %span= _('uses clusters to deploy your code!') + %span= _('uses Kubernetes clusters to deploy your code!') %hr %button.btn.btn-create.btn-xs.dismiss-feature-highlight{ type: 'button' } %span= _("Got it!") = sprite_icon('thumb-up') - - if @project.feature_available?(:builds, current_user) && !@project.empty_repo? = nav_link(path: 'pipelines#charts') do = link_to charts_project_pipelines_path(@project), title: 'Charts', class: 'shortcuts-pipelines-charts' do |