Merge branch '233449-aqualls-more-caps-changes' into 'master'

Revise capitalization of "merge request"

See merge request gitlab-org/gitlab!57635

app/views/projects/merge_requests/conflicts/show.html.haml

-- page_title _("Merge Conflicts"), "#{@merge_request.title} (#{@merge_request.to_reference}", _("Merge Requests")
+- page_title _("Merge Conflicts"), "#{@merge_request.title} (#{@merge_request.to_reference}", _("Merge requests")
 - add_page_specific_style 'page_bundles/merge_conflicts'
 
 = render "projects/merge_requests/mr_title"

app/views/projects/merge_requests/creations/_new_compare.html.haml

 %h3.page-title
-  New Merge Request
+  New merge request
 
 = form_for [@project, @merge_request], url: project_new_merge_request_path(@project), method: :get, html: { class: "merge-request-form js-requires-input" } do |f|
   - if params[:nav_source].present?

app/views/projects/merge_requests/creations/_new_submit.html.haml

 %h3.page-title
-  New Merge Request
+  New merge request
 = form_for [@project, @merge_request], html: { class: 'merge-request-form common-note-form js-requires-input js-quick-submit' } do |f|
   = render 'shared/issuable/form', f: f, issuable: @merge_request, commits: @commits, presenter: @mr_presenter
   = f.hidden_field :source_project_id

app/views/projects/merge_requests/creations/new.html.haml

-- add_to_breadcrumbs _("Merge Requests"), project_merge_requests_path(@project)
+- add_to_breadcrumbs _("Merge requests"), project_merge_requests_path(@project)
 - breadcrumb_title _("New")
-- page_title _("New Merge Request")
+- page_title _("New merge request")
 - add_page_specific_style 'page_bundles/pipelines'
 - add_page_specific_style 'page_bundles/ci_status'
 

app/views/projects/merge_requests/edit.html.haml

-- page_title _("Edit"), "#{@merge_request.title} (#{@merge_request.to_reference}", _("Merge Requests")
+- page_title _("Edit"), "#{@merge_request.title} (#{@merge_request.to_reference}", _("Merge requests")
 
 %h3.page-title
-  Edit Merge Request #{@merge_request.to_reference}
+  Edit merge request #{@merge_request.to_reference}
 = render 'form'

app/views/projects/merge_requests/index.html.haml

@@ -3,7 +3,7 @@
 - new_merge_request_path = project_new_merge_request_path(merge_project) if merge_project
 - issuable_type = 'merge_request'
 
-- page_title _("Merge Requests")
+- page_title _("Merge requests")
 - new_merge_request_email = @project.new_issuable_address(current_user, 'merge_request')
 
 = render 'projects/last_push'

app/views/projects/merge_requests/invalid.html.haml

-- page_title "#{@merge_request.title} (#{@merge_request.to_reference}", _("Merge Requests")
+- page_title "#{@merge_request.title} (#{@merge_request.to_reference}", _("Merge requests")
 - badge_css_classes = "badge gl-text-white"
 - badge_info_css_classes = "#{badge_css_classes} badge-info"
 - badge_inverse_css_classes = "#{badge_css_classes} badge-inverse"
@@ -25,4 +25,4 @@
         of internal error
 
     %strong
-      Please close Merge Request or change branches with existing one
+      Please close merge request or change branches with existing one

app/views/projects/merge_requests/show.html.haml

 - @gfm_form = true
 - @content_class = "merge-request-container#{' limit-container-width' unless fluid_layout}"
-- add_to_breadcrumbs _("Merge Requests"), project_merge_requests_path(@project)
+- add_to_breadcrumbs _("Merge requests"), project_merge_requests_path(@project)
 - breadcrumb_title @merge_request.to_reference
-- page_title "#{@merge_request.title} (#{@merge_request.to_reference})", _("Merge Requests")
+- page_title "#{@merge_request.title} (#{@merge_request.to_reference})", _("Merge requests")
 - page_description @merge_request.description_html
 - page_card_attributes @merge_request.card_attributes
 - suggest_changes_help_path = help_page_path('user/discussions/index.md', anchor: 'suggest-changes')

locale/gitlab.pot

@@ -20593,9 +20593,6 @@ msgstr ""
 msgid "New Label"
 msgstr ""
 
-msgid "New Merge Request"
-msgstr ""
-
 msgid "New Milestone"
 msgstr ""
 

spec/features/merge_request/user_creates_merge_request_spec.rb

@@ -87,7 +87,7 @@ RSpec.describe "User creates a merge request", :js do
 
       click_button("Compare branches and continue")
 
-      expect(page).to have_css("h3.page-title", text: "New Merge Request")
+      expect(page).to have_css("h3.page-title", text: "New merge request")
 
       page.within("form#new_merge_request") do
         fill_in("Title", with: title)

spec/features/merge_request/user_sees_breadcrumb_links_spec.rb

@@ -13,7 +13,7 @@ RSpec.describe 'New merge request breadcrumb' do
 
   it 'displays link to project merge requests and new merge request' do
     page.within '.breadcrumbs' do
-      expect(find_link('Merge Requests')[:href]).to end_with(project_merge_requests_path(project))
+      expect(find_link('Merge requests')[:href]).to end_with(project_merge_requests_path(project))
       expect(find_link('New')[:href]).to end_with(project_new_merge_request_path(project))
     end
   end

spec/features/projects/files/user_creates_directory_spec.rb

@@ -77,7 +77,7 @@ RSpec.describe 'Projects > Files > User creates a directory', :js do
     it 'creates the directory in the new branch and redirect to the merge request' do
       expect(page).to have_content('new-feature')
       expect(page).to have_content('The directory has been successfully created')
-      expect(page).to have_content('New Merge Request')
+      expect(page).to have_content('New merge request')
       expect(page).to have_content('From new-feature into master')
       expect(page).to have_content('Add new directory')