Skip to content
Snippets Groups Projects
Verified Commit 25d1c786 authored by Filipa Lacerda's avatar Filipa Lacerda
Browse files

Adds clusters to the navigation bar

Adds new line at the end of files
parent 5663b480
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -146,7 +146,7 @@
= number_with_delimiter(@project.open_merge_requests_count)
 
- if project_nav_tab? :pipelines
= nav_link(controller: [:pipelines, :builds, :jobs, :pipeline_schedules, :environments, :artifacts]) do
= nav_link(controller: [:pipelines, :builds, :jobs, :pipeline_schedules, :environments, :artifacts, :clusters]) do
= link_to project_pipelines_path(@project), class: 'shortcuts-pipelines' do
.nav-icon-container
= sprite_icon('pipeline')
Loading
Loading
@@ -189,6 +189,12 @@
%span
Charts
 
-# - if project_nav_tab? :clusters TODO @shinya @ayufan
= nav_link(controller: :clusters) do
= link_to project_clusters_path(@project), title: 'Clusters', class: 'shortcuts-clusters' do
%span
Clusters
- if project_nav_tab? :wiki
= nav_link(controller: :wikis) do
= link_to get_project_wiki_path(@project), class: 'shortcuts-wiki' do
Loading
Loading
Loading
Loading
@@ -34,4 +34,4 @@
= field.submit s_('ClusterIntegration|Create cluster'), class: 'btn btn-save'
 
-# TODO: Remove before merge
= link_to "Create on Google Container Engine", namespace_project_clusters_path(@project.namespace, @project, cluster: {cluster_name: "gke-test-creation#{Random.rand(100)}", gcp_project_id: 'gitlab-internal-153318', cluster_zone: 'us-central1-a', cluster_size: '1', project_namespace: 'aaa', machine_type: 'n1-standard-1'}), method: :post
\ No newline at end of file
= link_to "Create on Google Container Engine", namespace_project_clusters_path(@project.namespace, @project, cluster: {cluster_name: "gke-test-creation#{Random.rand(100)}", gcp_project_id: 'gitlab-internal-153318', cluster_zone: 'us-central1-a', cluster_size: '1', project_namespace: 'aaa', machine_type: 'n1-standard-1'}), method: :post
Loading
Loading
@@ -12,4 +12,4 @@
= s_('ClusterIntegration|Make sure your account %{link_to_requirements} to create clusters').html_safe % { link_to_requirements: link_to_requirements }
%li
- link_to_container_project = link_to(s_('ClusterIntegration|Google Container Engine project'))
= s_('ClusterIntegration|A %{link_to_container_project} must have been created under this account').html_safe % { link_to_container_project: link_to_container_project }
\ No newline at end of file
= s_('ClusterIntegration|A %{link_to_container_project} must have been created under this account').html_safe % { link_to_container_project: link_to_container_project }
Loading
Loading
@@ -5,4 +5,4 @@
= s_('ClusterIntegration|With cluster integration you can take advantage of Kubernetes auto deployment.')
%p
- link = link_to(s_('ClusterIntegration|auto deployment'), help_page_path('TODO'), target: '_blank', rel: 'noopener noreferrer')
= s_('ClusterIntegration|Learn more about %{link_to_documentation} in GitLab').html_safe % { link_to_documentation: link }
\ No newline at end of file
= s_('ClusterIntegration|Learn more about %{link_to_documentation} in GitLab').html_safe % { link_to_documentation: link }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment