summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Zallmann <tzallmann@gitlab.com>2018-04-12 17:49:05 +0000
committerTim Zallmann <tzallmann@gitlab.com>2018-04-12 17:49:05 +0000
commit7f01d49b69130343d95d7ec470d69aeb14fb94fe (patch)
tree1ab9df1e2654bc70f3b846221e23c8ef91f1c0fe
parentda6933883f42d66ca75e37a90f03d2a5b22e78ec (diff)
parent406915f4dbac9ce0826f0ba1cdcc04fb6a8c3b4c (diff)
downloadgitlab-ce-7f01d49b69130343d95d7ec470d69aeb14fb94fe.tar.gz
Merge branch 'rename-overview-project-sidenav' into 'master'
Renamed 'Overview' to 'Project' in the contextual navigation at a project level Closes #43430 See merge request gitlab-org/gitlab-ce!18295
-rw-r--r--app/views/layouts/nav/sidebar/_project.html.haml2
-rw-r--r--changelogs/unreleased/rename-overview-project-sidenav.yml5
-rw-r--r--spec/features/projects/user_uses_shortcuts_spec.rb6
3 files changed, 9 insertions, 4 deletions
diff --git a/app/views/layouts/nav/sidebar/_project.html.haml b/app/views/layouts/nav/sidebar/_project.html.haml
index 93f674b9d3c..196db08cebd 100644
--- a/app/views/layouts/nav/sidebar/_project.html.haml
+++ b/app/views/layouts/nav/sidebar/_project.html.haml
@@ -13,7 +13,7 @@
.nav-icon-container
= sprite_icon('project')
%span.nav-item-name
- Overview
+ Project
%ul.sidebar-sub-level-items
= nav_link(path: 'projects#show', html_options: { class: "fly-out-top-item" } ) do
diff --git a/changelogs/unreleased/rename-overview-project-sidenav.yml b/changelogs/unreleased/rename-overview-project-sidenav.yml
new file mode 100644
index 00000000000..3632ef25c00
--- /dev/null
+++ b/changelogs/unreleased/rename-overview-project-sidenav.yml
@@ -0,0 +1,5 @@
+---
+title: Renamed Overview to Project in the contextual navigation at a project level
+merge_request: 18295
+author: Constance Okoghenun
+type: changed
diff --git a/spec/features/projects/user_uses_shortcuts_spec.rb b/spec/features/projects/user_uses_shortcuts_spec.rb
index fb0d8c766fe..47c5a8161d9 100644
--- a/spec/features/projects/user_uses_shortcuts_spec.rb
+++ b/spec/features/projects/user_uses_shortcuts_spec.rb
@@ -11,12 +11,12 @@ describe 'User uses shortcuts', :js do
visit(project_path(project))
end
- context 'when navigating to the Overview pages' do
+ context 'when navigating to the Project pages' do
it 'redirects to the details page' do
find('body').native.send_key('g')
find('body').native.send_key('p')
- expect(page).to have_active_navigation('Overview')
+ expect(page).to have_active_navigation('Project')
expect(page).to have_active_sub_navigation('Details')
end
@@ -24,7 +24,7 @@ describe 'User uses shortcuts', :js do
find('body').native.send_key('g')
find('body').native.send_key('e')
- expect(page).to have_active_navigation('Overview')
+ expect(page).to have_active_navigation('Project')
expect(page).to have_active_sub_navigation('Activity')
end
end