diff options
| author | Mike Greiling <mike@pixelcog.com> | 2018-10-09 16:17:45 +0000 |
|---|---|---|
| committer | Jan Provaznik <jprovaznik@gitlab.com> | 2018-10-10 14:02:48 +0200 |
| commit | 98ab67462336cb1b1cb3ee412a4d2cf253340357 (patch) | |
| tree | 5d3bbb6897c44d55e3e5f4efd72faf64b5cc8bae | |
| parent | 58d86e37986dc38c008b620215e65355e6c4546f (diff) | |
| download | gitlab-ce-98ab67462336cb1b1cb3ee412a4d2cf253340357.tar.gz | |
Merge branch '52399-link-for-rbac-experimental-support-is-going-to-the-wrong-anchor' into 'master'
Resolve "Link for RBAC (experimental support) is going to the wrong anchor"
See merge request gitlab-org/gitlab-ce!22216
| -rw-r--r-- | app/views/projects/clusters/gcp/_form.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/clusters/user/_form.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/projects/clusters/gcp/_form.html.haml b/app/views/projects/clusters/gcp/_form.html.haml index eaf3a93bd15..171ceeceb68 100644 --- a/app/views/projects/clusters/gcp/_form.html.haml +++ b/app/views/projects/clusters/gcp/_form.html.haml @@ -68,7 +68,7 @@ .form-text.text-muted = s_('ClusterIntegration|Enable this setting if using role-based access control (RBAC).') = s_('ClusterIntegration|This option will allow you to install applications on RBAC clusters.') - = link_to _('More information'), help_page_path('user/project/clusters/index.md', anchor: 'role-based-access-control-rbac-experimental-support'), target: '_blank' + = link_to _('More information'), help_page_path('user/project/clusters/index.md', anchor: 'role-based-access-control-rbac-core-only'), target: '_blank' .form-group = field.submit s_('ClusterIntegration|Create Kubernetes cluster'), class: 'js-gke-cluster-creation-submit btn btn-success', disabled: true diff --git a/app/views/projects/clusters/user/_form.html.haml b/app/views/projects/clusters/user/_form.html.haml index 56551ed4d65..54a6e685bb0 100644 --- a/app/views/projects/clusters/user/_form.html.haml +++ b/app/views/projects/clusters/user/_form.html.haml @@ -32,7 +32,7 @@ .form-text.text-muted = s_('ClusterIntegration|Enable this setting if using role-based access control (RBAC).') = s_('ClusterIntegration|This option will allow you to install applications on RBAC clusters.') - = link_to _('More information'), help_page_path('user/project/clusters/index.md', anchor: 'role-based-access-control-rbac-experimental-support'), target: '_blank' + = link_to _('More information'), help_page_path('user/project/clusters/index.md', anchor: 'role-based-access-control-rbac-core-only'), target: '_blank' .form-group = field.submit s_('ClusterIntegration|Add Kubernetes cluster'), class: 'btn btn-success' |