From ea8f8dc29583c84862794225c8634e88cc7100af Mon Sep 17 00:00:00 2001
From: Lukas Eipert <leipert@gitlab.com>
Date: Thu, 2 Mar 2023 19:53:35 +0100
Subject: [PATCH] Rename "Repository > Locked Files" to "Repository > Locked
files"
Part of: https://gitlab.com/gitlab-org/gitlab/-/issues/378546
Changelog: changed
---
doc/user/project/file_lock.md | 2 +-
ee/lib/ee/sidebars/projects/menus/repository_menu.rb | 2 +-
ee/spec/features/projects/path_locks_spec.rb | 2 +-
ee/spec/views/layouts/nav/sidebar/_project.html.haml_spec.rb | 2 +-
locale/gitlab.pot | 3 ---
qa/qa/ee/page/project/sub_menus/repository.rb | 2 +-
spec/support/shared_contexts/navbar_structure_context.rb | 2 +-
7 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/doc/user/project/file_lock.md b/doc/user/project/file_lock.md
index d6351483b60e..b83feda0c96f 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/ee/lib/ee/sidebars/projects/menus/repository_menu.rb b/ee/lib/ee/sidebars/projects/menus/repository_menu.rb
index 8e2412d8caa6..add09bbe61bc 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 03c94291e79c..dbc5407a6282 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 c9344c197bd2..295de0812c41 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/locale/gitlab.pot b/locale/gitlab.pot
index bddcc828c9a3..4089e69c0b74 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -25730,9 +25730,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 359cfcfb14fe..eb75a2840eb1 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/spec/support/shared_contexts/navbar_structure_context.rb b/spec/support/shared_contexts/navbar_structure_context.rb
index 831cd87382b7..e67dbd87aa9c 100644
--- a/spec/support/shared_contexts/navbar_structure_context.rb
+++ b/spec/support/shared_contexts/navbar_structure_context.rb
@@ -37,7 +37,7 @@
_('Contributor statistics'),
_('Graph'),
_('Compare revisions'),
- (_('Locked Files') if Gitlab.ee?)
+ (_('Locked files') if Gitlab.ee?)
]
},
{
--
GitLab