Merge branch 'ce-to-ee-2018-06-18' into 'master'

CE upstream - 2018-06-18 18:21 UTC

See merge request gitlab-org/gitlab-ee!6172

app/views/projects/clusters/_sidebar.html.haml

+- clusters_help_url = help_page_path('user/project/clusters/index')
+- 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 }
 %p
   - docs_link = link_to s_('If you are setting up multiple clusters and are using Auto DevOps,|read this first'), help_page_path('topics/autodevops/index.md', anchor: 'using-multiple-kubernetes-clusters'), target: '_blank'
   = s_('ClusterIntegration|If you are setting up multiple clusters and are using Auto DevOps, %{docs_link}.').html_safe % { docs_link: docs_link }

locale/gitlab.pot

@@ -2625,6 +2625,12 @@ msgstr ""
 msgid "GeoNodes|Full"
 msgstr ""
 
+msgid "Gitaly Servers"
+msgstr ""
+
+msgid "Gitaly|Address"
+msgstr ""
+
 msgid "GeoNodes|GitLab version"
 msgstr ""