Commit 44809a62 authored by Enrique Alcántara's avatar Enrique Alcántara

Merge branch '334390-geo-nav-text' into 'master'

Geo: Update the navigation UI text

See merge request gitlab-org/gitlab!70512
parents 77eebce7 ce2f758c
...@@ -11,9 +11,9 @@ ...@@ -11,9 +11,9 @@
#{ _('Geo') } #{ _('Geo') }
%li.divider.fly-out-top-item %li.divider.fly-out-top-item
= nav_link(path: 'admin/geo/nodes#index') do = nav_link(path: 'admin/geo/nodes#index') do
= link_to admin_geo_nodes_path, title: _('Nodes') do = link_to admin_geo_nodes_path, title: _('Sites') do
%span %span
= _('Nodes') = _('Sites')
- if Gitlab::Geo.secondary? - if Gitlab::Geo.secondary?
= nav_link(controller: %w(admin/geo/projects admin/geo/uploads admin/geo/designs admin/geo/replicables)) do = nav_link(controller: %w(admin/geo/projects admin/geo/uploads admin/geo/designs admin/geo/replicables)) do
= link_to admin_geo_projects_path, title: _('Replication') do = link_to admin_geo_projects_path, title: _('Replication') do
......
...@@ -26,8 +26,8 @@ RSpec.describe 'admin Geo Sidebar', :js, :geo do ...@@ -26,8 +26,8 @@ RSpec.describe 'admin Geo Sidebar', :js, :geo do
end end
end end
describe 'visiting geo nodes' do describe 'visiting geo sites' do
it_behaves_like 'active sidebar link', 'Nodes' do it_behaves_like 'active sidebar link', 'Sites' do
let(:path) { admin_geo_nodes_path } let(:path) { admin_geo_nodes_path }
end end
end end
......
...@@ -31349,6 +31349,9 @@ msgstr "" ...@@ -31349,6 +31349,9 @@ msgstr ""
msgid "Site profile not found for given parameters" msgid "Site profile not found for given parameters"
msgstr "" msgstr ""
msgid "Sites"
msgstr ""
msgid "Size" msgid "Size"
msgstr "" msgstr ""
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment