diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2018-06-18 15:49:51 +0000 |
|---|---|---|
| committer | Clement Ho <clemmakesapps@gmail.com> | 2018-06-18 15:49:51 +0000 |
| commit | f67eb5a1ab6ec75aae24db4b3b98e23faafa6de6 (patch) | |
| tree | f9dcee90ab6cd426ba9062d6c735cf0b305afc70 | |
| parent | 8451c5ff605ee1e8ec3aa79ac101e2cce7b920f8 (diff) | |
| parent | 728f3034a95a6dff4303d7d29dee020c6f366454 (diff) | |
| download | gitlab-ce-f67eb5a1ab6ec75aae24db4b3b98e23faafa6de6.tar.gz | |
Merge branch '5956-auto-devops-multi-cluster-help-text' into 'master'
port 5956-auto-devops-multi-cluster-help-text to CE
See merge request gitlab-org/gitlab-ce!19680
| -rw-r--r-- | app/views/projects/clusters/_sidebar.html.haml | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/app/views/projects/clusters/_sidebar.html.haml b/app/views/projects/clusters/_sidebar.html.haml index 73cd7c50922..3d10348212f 100644 --- a/app/views/projects/clusters/_sidebar.html.haml +++ b/app/views/projects/clusters/_sidebar.html.haml @@ -1,7 +1,9 @@ +- clusters_help_url = help_page_path('user/project/clusters/index.md') +- help_link_start = "<a href=\"%{url}\" target=\"_blank\" rel=\"noopener noreferrer\">".html_safe +- help_link_end = '</a>'.html_safe %h4.prepend-top-0 = s_('ClusterIntegration|Kubernetes cluster integration') %p = s_('ClusterIntegration|With a Kubernetes cluster associated to this project, you can use review apps, deploy your applications, run your pipelines, and much more in an easy way.') %p - - link = link_to(_('Kubernetes'), help_page_path('user/project/clusters/index'), target: '_blank', rel: 'noopener noreferrer') - = s_('ClusterIntegration|Learn more about %{link_to_documentation}').html_safe % { link_to_documentation: link } + = s_('ClusterIntegration|Learn more about %{help_link_start}Kubernetes%{help_link_end}.').html_safe % { help_link_start: help_link_start % { url: clusters_help_url }, help_link_end: help_link_end } |