Add latest changes from gitlab-org/gitlab@master

2 files changed, 11 insertions, 11 deletions

diff --git a/spec/views/layouts/nav/sidebar/_group.html.haml_spec.rb b/spec/views/layouts/nav/sidebar/_group.html.haml_spec.rb
index 428e9cc8490..472a2f3cb34 100644
--- a/spec/views/layouts/nav/sidebar/_group.html.haml_spec.rb
+++ b/spec/views/layouts/nav/sidebar/_group.html.haml_spec.rb
@@ -109,7 +109,7 @@ RSpec.describe 'layouts/nav/sidebar/_group' do
     end
   end
 
-  describe 'Packages & Registries' do
+  describe 'Packages and registries' do
     it 'has a link to the package registry page' do
       stub_config(packages: { enabled: true })
 
@@ -178,10 +178,10 @@ RSpec.describe 'layouts/nav/sidebar/_group' do
       expect(rendered).to have_link('Applications', href: group_settings_applications_path(group))
     end
 
-    it 'has a link to the Package & Registries settings page' do
+    it 'has a link to the Package and registry settings page' do
       render
 
-      expect(rendered).to have_link('Packages & Registries', href: group_settings_packages_and_registries_path(group))
+      expect(rendered).to have_link('Packages and registries', href: group_settings_packages_and_registries_path(group))
     end
   end
 end
diff --git a/spec/views/layouts/nav/sidebar/_project.html.haml_spec.rb b/spec/views/layouts/nav/sidebar/_project.html.haml_spec.rb
index 9ae3f814679..f5cd5679270 100644
--- a/spec/views/layouts/nav/sidebar/_project.html.haml_spec.rb
+++ b/spec/views/layouts/nav/sidebar/_project.html.haml_spec.rb
@@ -559,7 +559,7 @@ RSpec.describe 'layouts/nav/sidebar/_project' do
     it 'top level navigation link is visible and points to package registry page' do
       render
 
-      expect(rendered).to have_link('Packages & Registries', href: project_packages_path(project))
+      expect(rendered).to have_link('Packages and registries', href: project_packages_path(project))
     end
 
     describe 'Packages Registry' do
@@ -908,7 +908,7 @@ RSpec.describe 'layouts/nav/sidebar/_project' do
       end
     end
 
-    describe 'Packages & Registries' do
+    describe 'Packages and registries' do
       let(:packages_enabled) { false }
 
       before do
@@ -919,20 +919,20 @@ RSpec.describe 'layouts/nav/sidebar/_project' do
       context 'when registry is enabled' do
         let(:registry_enabled) { true }
 
-        it 'has a link to the Packages & Registries settings' do
+        it 'has a link to the Package and registry settings' do
           render
 
-          expect(rendered).to have_link('Packages & Registries', href: project_settings_packages_and_registries_path(project))
+          expect(rendered).to have_link('Packages and registries', href: project_settings_packages_and_registries_path(project))
         end
       end
 
       context 'when registry is not enabled' do
         let(:registry_enabled) { false }
 
-        it 'does not have a link to the Packages & Registries settings' do
+        it 'does not have a link to the Package and registry settings' do
           render
 
-          expect(rendered).not_to have_link('Packages & Registries', href: project_settings_packages_and_registries_path(project))
+          expect(rendered).not_to have_link('Packages and registries', href: project_settings_packages_and_registries_path(project))
         end
       end
 
@@ -940,10 +940,10 @@ RSpec.describe 'layouts/nav/sidebar/_project' do
         let(:registry_enabled) { false }
         let(:packages_enabled) { true }
 
-        it 'has a link to the Packages & Registries settings' do
+        it 'has a link to the Package and registry settings' do
           render
 
-          expect(rendered).to have_link('Packages & Registries', href: project_settings_packages_and_registries_path(project))
+          expect(rendered).to have_link('Packages and registries', href: project_settings_packages_and_registries_path(project))
         end
       end
     end