Merge branch 'collapsed-contextual-nav-update' into 'master'

Renamed 'Overview' to 'Project' in collapsed contextual navigation at a project level

See merge request gitlab-org/gitlab-ce!18996

app/views/layouts/nav/sidebar/_project.html.haml

@@ -19,7 +19,7 @@
           = nav_link(path: 'projects#show', html_options: { class: "fly-out-top-item" } ) do
             = link_to project_path(@project) do
               %strong.fly-out-top-item-name
-                = _('Overview')
+                = _('Project')
           %li.divider.fly-out-top-item
           = nav_link(path: 'projects#show') do
             = link_to project_path(@project), title: _('Project details'), class: 'shortcuts-project' do

changelogs/unreleased/collapsed-contextual-nav-update.yml

+---
+title: Renamed 'Overview' to 'Project' in collapsed contextual navigation at a project
+  level
+merge_request: 18996
+author: Constance Okoghenun
+type: fixed

spec/features/projects/actve_tabs_spec.rb

@@ -35,7 +35,7 @@ describe 'Project active tab' do
       visit project_path(project)
     end
 
-    it_behaves_like 'page has active tab', 'Overview'
+    it_behaves_like 'page has active tab', 'Project'
     it_behaves_like 'page has active sub tab', 'Details'
 
     context 'on project Home/Activity' do
@@ -43,7 +43,7 @@ describe 'Project active tab' do
         click_tab('Activity')
       end
 
-      it_behaves_like 'page has active tab', 'Overview'
+      it_behaves_like 'page has active tab', 'Project'
       it_behaves_like 'page has active sub tab', 'Activity'
     end
   end

spec/features/projects/user_sees_sidebar_spec.rb

@@ -37,7 +37,7 @@ describe 'Projects > User sees sidebar' do
       visit project_path(project)
 
       within('.nav-sidebar') do
-        expect(page).to have_content 'Overview'
+        expect(page).to have_content 'Project'
         expect(page).to have_content 'Issues'
         expect(page).to have_content 'Wiki'