diff options
author | Kushal Pandya <kushalspandya@gmail.com> | 2019-09-11 09:09:21 +0000 |
---|---|---|
committer | Kushal Pandya <kushalspandya@gmail.com> | 2019-09-11 09:09:21 +0000 |
commit | 6d7deac3f6daba94b385e83759f3f3e9ccf6f4c9 (patch) | |
tree | af0c598668fa0b587c83438ea74dae1f89fc0747 | |
parent | af03cb0683b621433f268392be4a5e0261a8c7e5 (diff) | |
parent | d6a5d08e2a2aebae7a9b9bc8d1389e4777f6dbb7 (diff) | |
download | gitlab-ce-6d7deac3f6daba94b385e83759f3f3e9ccf6f4c9.tar.gz |
Merge branch 'dz-fix-add-cluster-doc-links' into 'master'
Fix doc links for adding a cluster to a project
See merge request gitlab-org/gitlab-ce!32890
-rw-r--r-- | app/views/clusters/clusters/user/_form.html.haml | 2 | ||||
-rw-r--r-- | app/views/clusters/clusters/user/_header.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/clusters/clusters/user/_form.html.haml b/app/views/clusters/clusters/user/_form.html.haml index 5507f12b73b..a6acf948ed4 100644 --- a/app/views/clusters/clusters/user/_form.html.haml +++ b/app/views/clusters/clusters/user/_form.html.haml @@ -1,5 +1,5 @@ - more_info_link = link_to _('More information'), help_page_path('user/project/clusters/index.md', - anchor: 'adding-an-existing-kubernetes-cluster'), target: '_blank' + anchor: 'add-existing-kubernetes-cluster'), target: '_blank' - rbac_help_link = link_to _('More information'), help_page_path('user/project/clusters/index.md', anchor: 'role-based-access-control-rbac-core-only'), target: '_blank' diff --git a/app/views/clusters/clusters/user/_header.html.haml b/app/views/clusters/clusters/user/_header.html.haml index 749177fa6c1..3b9ceaa2b8a 100644 --- a/app/views/clusters/clusters/user/_header.html.haml +++ b/app/views/clusters/clusters/user/_header.html.haml @@ -1,5 +1,5 @@ %h4 = s_('ClusterIntegration|Enter the details for your Kubernetes cluster') %p - - link_to_help_page = link_to(s_('ClusterIntegration|documentation'), help_page_path('user/project/clusters/index', anchor: 'adding-an-existing-kubernetes-cluster'), target: '_blank', rel: 'noopener noreferrer') + - link_to_help_page = link_to(s_('ClusterIntegration|documentation'), help_page_path('user/project/clusters/index', anchor: 'add-existing-kubernetes-cluster'), target: '_blank', rel: 'noopener noreferrer') = s_('ClusterIntegration|Please enter access information for your Kubernetes cluster. If you need help, you can read our %{link_to_help_page} on Kubernetes').html_safe % { link_to_help_page: link_to_help_page } |