diff --git a/app/views/projects/compare/index.html.haml b/app/views/projects/compare/index.html.haml
index b3590eea63162fb131917d1ed79a029482ac6962..58da76a323137b714d64e2f14c213d4239a6ad1c 100644
--- a/app/views/projects/compare/index.html.haml
+++ b/app/views/projects/compare/index.html.haml
@@ -1,5 +1,5 @@
-- breadcrumb_title _("Compare Revisions")
-- page_title _("Compare")
+- breadcrumb_title _("Compare revisions")
+- page_title _("Compare revisions")
%h1.page-title.gl-font-size-h-display
= _("Compare Git revisions")
diff --git a/app/views/projects/compare/show.html.haml b/app/views/projects/compare/show.html.haml
index 1bdf3d1e6e38474620570673b5424bfd3300671c..bc3781820572fca707ae05817ac6582f3e6ceb31 100644
--- a/app/views/projects/compare/show.html.haml
+++ b/app/views/projects/compare/show.html.haml
@@ -1,4 +1,4 @@
-- add_to_breadcrumbs _("Compare Revisions"), project_compare_index_path(@project)
+- add_to_breadcrumbs _("Compare revisions"), project_compare_index_path(@project)
- page_title "#{params[:from]}...#{params[:to]}"
.sub-header-block.gl-border-b-0.gl-mb-0
diff --git a/app/views/projects/graphs/show.html.haml b/app/views/projects/graphs/show.html.haml
index 754de2db8f3debc104c28a37c32d7f86ac1cd7c5..9d6f67bd1900042da36fc15dcb1e198fdf519926 100644
--- a/app/views/projects/graphs/show.html.haml
+++ b/app/views/projects/graphs/show.html.haml
@@ -1,4 +1,4 @@
-- page_title _('Contributors')
+- page_title _('Contributor statistics')
- graph_path = project_graph_path(@project, current_ref, ref_type: @ref_type, format: :json)
- commits_path = project_commits_path(@project, current_ref, ref_type: @ref_type)
diff --git a/doc/user/project/file_lock.md b/doc/user/project/file_lock.md
index d6351483b60e4a7b2b90f32299e5013b38da0f9b..b83feda0c96f1b02a19e203a86af00752863c200 100644
--- a/doc/user/project/file_lock.md
+++ b/doc/user/project/file_lock.md
@@ -221,7 +221,7 @@ To view the user who locked the file (if it was not you), hover over the button.
To view and remove file locks:
1. On the top bar, select **Main menu > Projects** and find your project.
-1. On the left sidebar, select **Repository > Locked Files**.
+1. On the left sidebar, select **Repository > Locked files**.
This list shows all the files locked either through LFS or GitLab UI.
diff --git a/doc/user/project/repository/branches/index.md b/doc/user/project/repository/branches/index.md
index 8169956c02eea77738e07c558c5e552cc81832bf..13ee6fcdc9122dc26da2da6a1a8cf76538603eef 100644
--- a/doc/user/project/repository/branches/index.md
+++ b/doc/user/project/repository/branches/index.md
@@ -62,7 +62,7 @@ issue number. GitLab uses the issue number to import data into the merge request
To compare branches in a repository:
1. On the top bar, select **Main menu > Projects** and find your project.
-1. On the left sidebar, select **Repository > Compare**.
+1. On the left sidebar, select **Repository > Compare revisions**.
1. Select the **Source** branch to search for your desired branch. Exact matches are
shown first. You can refine your search with operators:
- `^` matches the beginning of the branch name: `^feat` matches `feat/user-authentication`.
diff --git a/doc/user/project/repository/index.md b/doc/user/project/repository/index.md
index 5b4e1b1448945527e5fe55ff46f8d146311a1f02..1d32dd3973d052eac2f93ef5f155a91de44edf64 100644
--- a/doc/user/project/repository/index.md
+++ b/doc/user/project/repository/index.md
@@ -235,9 +235,9 @@ The size can differ slightly from one instance to another due to compression, ho
Administrators can set a [repository size limit](../../admin_area/settings/account_and_limit_settings.md).
[GitLab sets the size limits for GitLab.com](../../gitlab_com/index.md#account-and-limit-settings).
-## Repository contributor graph
+## Repository contributor statistics
-All code contributors are displayed under your project's **Repository > Contributors**.
+All code contributors are displayed under your project's **Repository > Contributor statistics**.
The graph shows the contributor with the most commits to the fewest.
diff --git a/ee/lib/ee/sidebars/projects/menus/repository_menu.rb b/ee/lib/ee/sidebars/projects/menus/repository_menu.rb
index 8e2412d8caa65f2bf13d0c8aaa68c1d73cce74a2..add09bbe61bc7e0d368fe50e69cdb18e3e74c071 100644
--- a/ee/lib/ee/sidebars/projects/menus/repository_menu.rb
+++ b/ee/lib/ee/sidebars/projects/menus/repository_menu.rb
@@ -24,7 +24,7 @@ def file_locks_menu_item
end
::Sidebars::MenuItem.new(
- title: _('Locked Files'),
+ title: _('Locked files'),
link: project_path_locks_path(context.project),
active_routes: { controller: :path_locks },
item_id: :file_locks
diff --git a/ee/spec/features/projects/path_locks_spec.rb b/ee/spec/features/projects/path_locks_spec.rb
index 03c94291e79cc51e99718a19c1975a555f9055ed..dbc5407a6282f1ecaf797472c5a4dcdae15e69cd 100644
--- a/ee/spec/features/projects/path_locks_spec.rb
+++ b/ee/spec/features/projects/path_locks_spec.rb
@@ -72,7 +72,7 @@
it 'managing of lock list' do
create :path_lock, path: 'encoding', user: user, project: project
- click_link "Locked Files"
+ click_link "Locked files"
within '.locks' do
expect(page).to have_content('encoding')
diff --git a/ee/spec/views/layouts/nav/sidebar/_project.html.haml_spec.rb b/ee/spec/views/layouts/nav/sidebar/_project.html.haml_spec.rb
index fa71e4658efbd324e343219e5d6af8c7b1b74486..1b212e845ed1c5d799beec1b3a44cb59c6a6d71a 100644
--- a/ee/spec/views/layouts/nav/sidebar/_project.html.haml_spec.rb
+++ b/ee/spec/views/layouts/nav/sidebar/_project.html.haml_spec.rb
@@ -36,7 +36,7 @@
render
- expect(rendered).to have_link('Locked Files', href: project_path_locks_path(project))
+ expect(rendered).to have_link('Locked files', href: project_path_locks_path(project))
end
end
end
diff --git a/lib/sidebars/projects/menus/repository_menu.rb b/lib/sidebars/projects/menus/repository_menu.rb
index ec91ae741fe56afd4a0b23cc9670f7ce474c3d6b..5bfc9e727ffbc1142bbabc1a81bfca363820ee6b 100644
--- a/lib/sidebars/projects/menus/repository_menu.rb
+++ b/lib/sidebars/projects/menus/repository_menu.rb
@@ -92,7 +92,7 @@ def contributors_menu_item
link = project_graph_path(context.project, context.current_ref, ref_type: ref_type_from_context(context))
::Sidebars::MenuItem.new(
- title: _('Contributors'),
+ title: _('Contributor statistics'),
link: link,
active_routes: { path: 'graphs#show' },
item_id: :contributors
@@ -112,7 +112,7 @@ def graphs_menu_item
def compare_menu_item
::Sidebars::MenuItem.new(
- title: _('Compare'),
+ title: _('Compare revisions'),
link: project_compare_index_path(context.project, from: context.project.repository.root_ref, to: context.current_ref),
active_routes: { controller: :compare },
item_id: :compare
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index 29eb4f9dd4773a9cf15af032fbd258e0dcb6c592..f58b7d5124a4f67d9c4667fe3da47339eb769eac 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -10390,9 +10390,6 @@ msgstr ""
msgid "Compare GitLab plans"
msgstr ""
-msgid "Compare Revisions"
-msgstr ""
-
msgid "Compare branches and continue"
msgstr ""
@@ -10405,6 +10402,9 @@ msgstr ""
msgid "Compare changes with the merge request target branch"
msgstr ""
+msgid "Compare revisions"
+msgstr ""
+
msgid "Compare submodule commit revisions"
msgstr ""
@@ -11401,7 +11401,7 @@ msgstr ""
msgid "Contributor"
msgstr ""
-msgid "Contributors"
+msgid "Contributor statistics"
msgstr ""
msgid "Control emails linked to your account"
@@ -25756,9 +25756,6 @@ msgstr ""
msgid "Locked"
msgstr ""
-msgid "Locked Files"
-msgstr ""
-
msgid "Locked by %{fileLockUserName}"
msgstr ""
diff --git a/qa/qa/ee/page/project/sub_menus/repository.rb b/qa/qa/ee/page/project/sub_menus/repository.rb
index 359cfcfb14fe8a1dffa7dff3423f2a51852aa9ec..eb75a2840eb1d7820f6df33faedd59dbf7b329ab 100644
--- a/qa/qa/ee/page/project/sub_menus/repository.rb
+++ b/qa/qa/ee/page/project/sub_menus/repository.rb
@@ -17,7 +17,7 @@ def self.prepended(base)
def go_to_repository_locked_files
hover_repository do
within_submenu do
- click_element(:sidebar_menu_item_link, menu_item: 'Locked Files')
+ click_element(:sidebar_menu_item_link, menu_item: 'Locked files')
end
end
end
diff --git a/qa/qa/page/project/sub_menus/repository.rb b/qa/qa/page/project/sub_menus/repository.rb
index f9d55c0009ca29a6f0fdd5e41da5eaa4bdf8f51d..b8ebaa10a49d09a1462b639270a085f9a241b386 100644
--- a/qa/qa/page/project/sub_menus/repository.rb
+++ b/qa/qa/page/project/sub_menus/repository.rb
@@ -40,7 +40,7 @@ def go_to_repository_tags
def go_to_repository_contributors
hover_repository do
within_submenu do
- click_element(:sidebar_menu_item_link, menu_item: 'Contributors')
+ click_element(:sidebar_menu_item_link, menu_item: 'Contributor statistics')
end
end
end
diff --git a/spec/lib/sidebars/projects/menus/repository_menu_spec.rb b/spec/lib/sidebars/projects/menus/repository_menu_spec.rb
index 40ca210769853171ce4a7ff5a69a1af0e25d01f0..b0631aacdb9f2fd9c98c458e3a2bce4093ea3ebc 100644
--- a/spec/lib/sidebars/projects/menus/repository_menu_spec.rb
+++ b/spec/lib/sidebars/projects/menus/repository_menu_spec.rb
@@ -85,7 +85,7 @@
end
end
- describe 'Contributors' do
+ describe 'Contributor statistics' do
let_it_be(:item_id) { :contributors }
context 'when analytics is disabled' do
diff --git a/spec/support/shared_contexts/navbar_structure_context.rb b/spec/support/shared_contexts/navbar_structure_context.rb
index e1ac0e3fd0a7a9989256ac4770e6ece439084e21..3af0b30bca080c222162a5c5ad688f661749044a 100644
--- a/spec/support/shared_contexts/navbar_structure_context.rb
+++ b/spec/support/shared_contexts/navbar_structure_context.rb
@@ -34,10 +34,10 @@
_('Commits'),
_('Branches'),
_('Tags'),
- _('Contributors'),
+ _('Contributor statistics'),
_('Graph'),
- _('Compare'),
- (_('Locked Files') if Gitlab.ee?)
+ _('Compare revisions'),
+ (_('Locked files') if Gitlab.ee?)
]
},
{
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 dc9575dc767116f6b70ede511c47320f6fec93cf..0df490f9b4130f5e50afc674dcb3ef1b53018fe1 100644
--- a/spec/views/layouts/nav/sidebar/_project.html.haml_spec.rb
+++ b/spec/views/layouts/nav/sidebar/_project.html.haml_spec.rb
@@ -106,11 +106,11 @@
end
end
- describe 'Contributors' do
+ describe 'Contributor statistics' do
it 'has a link to the project contributors path' do
render
- expect(rendered).to have_link('Contributors', href: project_graph_path(project, current_ref, ref_type: 'heads'))
+ expect(rendered).to have_link('Contributor statistics', href: project_graph_path(project, current_ref, ref_type: 'heads'))
end
end
@@ -122,11 +122,11 @@
end
end
- describe 'Compare' do
+ describe 'Compare revisions' do
it 'has a link to the project compare path' do
render
- expect(rendered).to have_link('Compare', href: project_compare_index_path(project, from: project.repository.root_ref, to: current_ref))
+ expect(rendered).to have_link('Compare revisions', href: project_compare_index_path(project, from: project.repository.root_ref, to: current_ref))
end
end
end