diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2017-10-02 10:41:54 +0100 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2017-10-02 10:49:00 +0100 |
| commit | 25d1c786d0463fbdd4d149c106ce9965601b197f (patch) | |
| tree | 04cacd9d5773a391c9f6047c8f5f83e21a8943d9 /app/views/projects/clusters | |
| parent | 5663b4808df787b1bcbf32ba54eccbb4c7537e25 (diff) | |
| download | gitlab-ce-25d1c786d0463fbdd4d149c106ce9965601b197f.tar.gz | |
Adds clusters to the navigation bar
Adds new line at the end of files
Diffstat (limited to 'app/views/projects/clusters')
| -rw-r--r-- | app/views/projects/clusters/_form.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/clusters/_header.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/clusters/_sidebar.html.haml | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/app/views/projects/clusters/_form.html.haml b/app/views/projects/clusters/_form.html.haml index d2a2bc0b6be..1951f1ab9eb 100644 --- a/app/views/projects/clusters/_form.html.haml +++ b/app/views/projects/clusters/_form.html.haml @@ -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 diff --git a/app/views/projects/clusters/_header.html.haml b/app/views/projects/clusters/_header.html.haml index 52a123d603e..795299b0625 100644 --- a/app/views/projects/clusters/_header.html.haml +++ b/app/views/projects/clusters/_header.html.haml @@ -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 } diff --git a/app/views/projects/clusters/_sidebar.html.haml b/app/views/projects/clusters/_sidebar.html.haml index f2f9e04f80e..d73a6baf14f 100644 --- a/app/views/projects/clusters/_sidebar.html.haml +++ b/app/views/projects/clusters/_sidebar.html.haml @@ -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 } |