diff options
| author | Kamil Trzcinski <ayufan@ayufan.eu> | 2017-11-01 12:11:47 +0100 |
|---|---|---|
| committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2017-11-01 12:11:47 +0100 |
| commit | 882cf2e409ce2ea798fce7f3082083fcdf143baf (patch) | |
| tree | 6980c0759b955bcf00f4710dac4a7a251178ebb1 /app/views | |
| parent | 5754908fee556062ab2e42a418bf192a0bf56402 (diff) | |
| download | gitlab-ce-882cf2e409ce2ea798fce7f3082083fcdf143baf.tar.gz | |
Fix paths to the first page
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/projects/clusters/new.html.haml | 7 | ||||
| -rw-r--r-- | app/views/projects/clusters/new_gcp.html.haml (renamed from app/views/projects/clusters/new_kubernetes_form.html.haml) | 1 |
2 files changed, 3 insertions, 5 deletions
diff --git a/app/views/projects/clusters/new.html.haml b/app/views/projects/clusters/new.html.haml index 3963e4741f3..b11202a4985 100644 --- a/app/views/projects/clusters/new.html.haml +++ b/app/views/projects/clusters/new.html.haml @@ -8,9 +8,6 @@ %h4= s_('ClusterIntegration|Choose how to set up cluster integration') %p= s_('ClusterIntegration| Create a new cluster on Google Engine right from GitLab') - -# TODO FIX PATH - = link_to s_('ClusterIntegration|Create on GKE'), providers_gcp_login_project_clusters_path(@project), class: 'btn append-bottom-20' - -# TODO FIX PATH + = link_to s_('ClusterIntegration|Create on GKE'), providers_gcp_new_namespace_project_clusters_path(@project.namespace, @project), class: 'btn append-bottom-20' %p= s_('ClusterIntegration| Enter the details for an existing Kubernetes cluster') - = link_to s_('ClusterIntegration|Add an existing cluster'), project_settings_integrations_path(@project), class: 'btn append-bottom-20' - + = link_to s_('ClusterIntegration|Add an existing cluster'), edit_project_service_path(@project, :kubernetes), class: 'btn append-bottom-20' diff --git a/app/views/projects/clusters/new_kubernetes_form.html.haml b/app/views/projects/clusters/new_gcp.html.haml index c538d41ffad..ad4b250db35 100644 --- a/app/views/projects/clusters/new_kubernetes_form.html.haml +++ b/app/views/projects/clusters/new_gcp.html.haml @@ -6,4 +6,5 @@ = render 'sidebar' .col-sm-8 = render 'header' + = render 'form' |