diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-29 06:06:28 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-29 06:06:28 +0300 |
| commit | a5eef71805f791dac4ce14a30ca6b59ee31295c8 (patch) | |
| tree | b799eafca34c5e82a191a419ab0aba1f4ab4d043 /app/views | |
| parent | abfafe3c57f56cd76a0a9afb7275cddb12304544 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/clusters/clusters/user/_form.html.haml | 8 | ||||
| -rw-r--r-- | app/views/clusters/clusters/user/_header.html.haml | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/app/views/clusters/clusters/user/_form.html.haml b/app/views/clusters/clusters/user/_form.html.haml index a6acf948ed4..c16f5f333f5 100644 --- a/app/views/clusters/clusters/user/_form.html.haml +++ b/app/views/clusters/clusters/user/_form.html.haml @@ -1,7 +1,7 @@ -- more_info_link = link_to _('More information'), help_page_path('user/project/clusters/index.md', - 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' +- more_info_link = link_to _('More information'), help_page_path('user/project/clusters/add_remove_cluster.md', + anchor: 'add-existing-cluster'), target: '_blank' +- rbac_help_link = link_to _('More information'), help_page_path('user/project/clusters/add_remove_cluster.md', + anchor: 'access-controls'), target: '_blank' - api_url_help_text = s_('ClusterIntegration|The URL used to access the Kubernetes API.') - ca_cert_help_text = s_('ClusterIntegration|The Kubernetes certificate used to authenticate to the cluster.') diff --git a/app/views/clusters/clusters/user/_header.html.haml b/app/views/clusters/clusters/user/_header.html.haml index 3b9ceaa2b8a..7067c892af3 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: 'add-existing-kubernetes-cluster'), target: '_blank', rel: 'noopener noreferrer') + - link_to_help_page = link_to(s_('ClusterIntegration|documentation'), help_page_path('user/project/clusters/add_remove_cluster', anchor: 'add-existing-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 } |