Commit c3da400b authored by Amy Qualls's avatar Amy Qualls Committed by Ezekiel Kigbo

Menu items: fix capitalization of Merge Request

We should not ever capitalize the 'R' in 'merge request,' and should
only capitalize the 'M' when it's the first word in the slug /
sentence.
parent 425d63ff
......@@ -91,13 +91,13 @@
.nav-icon-container
= sprite_icon('git-merge')
%span.nav-item-name
= _('Merge Requests')
= _('Merge requests')
%span.badge.badge-pill.count= merge_requests_count
%ul.sidebar-sub-level-items.is-fly-out-only
= nav_link(path: 'groups#merge_requests', html_options: { class: "fly-out-top-item" } ) do
= link_to merge_requests_group_path(@group) do
%strong.fly-out-top-item-name
= _('Merge Requests')
= _('Merge requests')
%span.badge.badge-pill.count.merge_counter.js-merge-counter.fly-out-badge= merge_requests_count
= render_if_exists "layouts/nav/ee/security_link" # EE-specific
......
......@@ -160,14 +160,14 @@
.nav-icon-container
= sprite_icon('git-merge')
%span.nav-item-name#js-onboarding-mr-link
= _('Merge Requests')
= _('Merge requests')
%span.badge.badge-pill.count.merge_counter.js-merge-counter
= number_with_delimiter(@project.open_merge_requests_count)
%ul.sidebar-sub-level-items.is-fly-out-only
= nav_link(controller: :merge_requests, html_options: { class: "fly-out-top-item" } ) do
= link_to project_merge_requests_path(@project) do
%strong.fly-out-top-item-name
= _('Merge Requests')
= _('Merge requests')
%span.badge.badge-pill.count.merge_counter.js-merge-counter.fly-out-badge
= number_with_delimiter(@project.open_merge_requests_count)
......
......@@ -85,7 +85,7 @@ RSpec.describe 'Project navbar' do
stub_licensed_features(requirements: true)
insert_after_nav_item(
_('Merge Requests'),
_('Merge requests'),
new_nav_item: {
nav_item: _('Requirements'),
nav_sub_items: [_('List')]
......
......@@ -19,7 +19,7 @@ RSpec.describe 'The group page' do
expect(page).to have_link('Details')
expect(page).to have_link('Activity')
expect(page).to have_link('Issues')
expect(page).to have_link('Merge Requests')
expect(page).to have_link('Merge requests')
expect(page).to have_link('Members')
end
end
......@@ -50,7 +50,7 @@ RSpec.describe 'The group page' do
expect(page).not_to have_link('Contribution')
expect(page).not_to have_link('Issues')
expect(page).not_to have_link('Merge Requests')
expect(page).not_to have_link('Merge requests')
expect(page).to have_link('Members')
end
end
......
......@@ -27,7 +27,7 @@ RSpec.describe 'Group merge requests page' do
end
it 'ignores archived merge request count badges in navbar' do
expect(first(:link, text: 'Merge Requests').find('.badge').text).to eq("1")
expect(first(:link, text: 'Merge requests').find('.badge').text).to eq("1")
end
it 'ignores archived merge request count badges in state-filters' do
......
......@@ -30,7 +30,7 @@ RSpec.describe 'Group navbar' do
]
},
{
nav_item: _('Merge Requests'),
nav_item: _('Merge requests'),
nav_sub_items: []
},
(security_and_compliance_nav_item if Gitlab.ee?),
......
......@@ -79,7 +79,7 @@ RSpec.describe 'Project active tab' do
visit project_merge_requests_path(project)
end
it_behaves_like 'page has active tab', 'Merge Requests'
it_behaves_like 'page has active tab', 'Merge requests'
end
context 'on project Wiki' do
......
......@@ -208,7 +208,7 @@ RSpec.describe 'Project fork' do
expect(page).to have_content(/new merge request/i)
page.within '.nav-sidebar' do
first(:link, 'Merge Requests').click
first(:link, 'Merge requests').click
end
expect(page).to have_content(/new merge request/i)
......
......@@ -14,7 +14,9 @@ RSpec.describe 'Merge Request button' do
it 'does not show Create merge request button' do
visit url
expect(page).not_to have_link(label)
within '.content-wrapper' do
expect(page).not_to have_link(label)
end
end
end
......
......@@ -151,7 +151,7 @@ RSpec.describe 'User uses shortcuts', :js do
find('body').native.send_key('g')
find('body').native.send_key('m')
expect(page).to have_active_navigation('Merge Requests')
expect(page).to have_active_navigation('Merge requests')
end
end
......
......@@ -59,7 +59,7 @@ RSpec.shared_context 'project navbar structure' do
]
},
{
nav_item: _('Merge Requests'),
nav_item: _('Merge requests'),
nav_sub_items: []
},
{
......@@ -190,7 +190,7 @@ RSpec.shared_context 'group navbar structure' do
]
},
{
nav_item: _('Merge Requests'),
nav_item: _('Merge requests'),
nav_sub_items: []
},
security_and_compliance_nav_item,
......
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