Merge branch 'add-npm-to-packages-views' into 'master'

Fix packages UI mentioned only Maven packages support

Closes #9160

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

app/assets/javascripts/pages/projects/shared/permissions/components/settings_panel.vue

@@ -321,7 +321,7 @@ export default {
           v-if="packagesAvailable"
           :help-path="packagesHelpPath"
           label="Packages"
-          help-text="Every project can have its own space to store its Maven packages"
+          help-text="Every project can have its own space to store its packages"
         >
           <project-feature-toggle
             v-model="packagesEnabled"

ee/app/views/projects/packages/packages/index.html.haml

@@ -46,6 +46,6 @@
       .text-content
         %h4.text-center= _('There are no packages yet')
         %p
-          - no_packages_url = help_page_path('user/project/packages/maven_repository.html')
+          - no_packages_url = help_page_path('administration/packages.html')
           - no_packages_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: no_packages_url }
-          = _('Learn how to %{no_packages_link_start}publish and share your Maven packages%{no_packages_link_end} with GitLab. Additional package types will be supported in future releases.').html_safe % { no_packages_link_start: no_packages_link_start, no_packages_link_end: '</a>'.html_safe }
+          = _('Learn how to %{no_packages_link_start}publish and share your packages%{no_packages_link_end} with GitLab.').html_safe % { no_packages_link_start: no_packages_link_start, no_packages_link_end: '</a>'.html_safe }

ee/changelogs/unreleased/add-npm-to-packages-views.yml

+---
+title: Fix packages UI mentioned only Maven packages support
+merge_request: 9132
+author:
+type: changed

locale/gitlab.pot

@@ -5204,7 +5204,7 @@ msgstr ""
 msgid "Latest pipeline for this branch"
 msgstr ""
 
-msgid "Learn how to %{no_packages_link_start}publish and share your Maven packages%{no_packages_link_end} with GitLab. Additional package types will be supported in future releases."
+msgid "Learn how to %{no_packages_link_start}publish and share your packages%{no_packages_link_end} with GitLab."
 msgstr ""
 
 msgid "Learn more"