Merge branch 'package-registry-settings-text' into 'master'

Revised Package Registry settings text

See merge request gitlab-org/gitlab!66395

app/views/admin/application_settings/_package_registry.html.haml

@@ -6,7 +6,7 @@
       %button.btn.gl-button.btn-default.js-settings-toggle{ type: 'button' }
         = expanded_by_default? ? _('Collapse') : _('Expand')
       %p
-        = _("Settings related to the use and experience of using GitLab's Package Registry.")
+        = _("Control how the GitLab Package Registry functions.")
 
     = render_if_exists 'admin/application_settings/ee_package_registry'
 

ee/app/views/admin/application_settings/_ee_package_registry.haml

@@ -7,8 +7,6 @@
         .form-check
           = f.check_box :npm_package_requests_forwarding, class: 'form-check-input'
           = f.label :npm_package_requests_forwarding, class: 'form-check-label' do
-            Enable forwarding of npm package requests to npmjs.org
-            .form-text.text-muted
-              = _("When enabled, if an npm package isn't found in the GitLab Registry, we will attempt to pull from the global npm registry.")
+            Forward npm package requests to the npm Registry if the packages are not found in the GitLab Package Registry
 
     = f.submit _('Save changes'), class: 'btn gl-button btn-confirm'

ee/spec/features/admin/admin_settings_spec.rb

@@ -268,7 +268,7 @@
 
     it 'allows you to change the npm_forwaring setting' do
       page.within('#js-package-settings') do
-        check 'Enable forwarding of npm package requests to npmjs.org'
+        check 'Forward npm package requests to the npm Registry if the packages are not found in the GitLab Package Registry'
         click_button 'Save'
       end
 

locale/gitlab.pot

@@ -8892,6 +8892,9 @@ msgstr ""
 msgid "Control emails linked to your account"
 msgstr ""
+msgid "Control how the GitLab Package Registry functions."
+msgstr ""
+
 msgid "Control whether to display third-party offers in GitLab."
 msgstr ""
@@ -30005,9 +30008,6 @@ msgstr ""
 msgid "Settings"
 msgstr ""
-msgid "Settings related to the use and experience of using GitLab's Package Registry."
-msgstr ""
-
 msgid "Setup"
 msgstr ""
@@ -36913,9 +36913,6 @@ msgstr ""
 msgid "When disabled, an external authentication provider must be used."
 msgstr ""
-msgid "When enabled, if an npm package isn't found in the GitLab Registry, we will attempt to pull from the global npm registry."
-msgstr ""
-
 msgid "When enabled, users cannot use GitLab until the terms have been accepted."
 msgstr ""