Merge branch 'aqualls-more-mr-caps' into 'master'

Fix more mis-capitalizations of Merge Request

See merge request gitlab-org/gitlab!58445

app/finders/merge_requests/by_approvals_finder.rb

@@ -60,14 +60,14 @@ module MergeRequests
       ids.first.to_s.downcase == label || usernames.map(&:downcase).include?(label)
     end
 
-    # Merge Requests without any approval
+    # Merge requests without any approval
     #
     # @param [ActiveRecord::Relation] items
     def without_approvals(items)
       items.without_approvals
     end
 
-    # Merge Requests with any number of approvals
+    # Merge requests with any number of approvals
     #
     # @param [ActiveRecord::Relation] items the activerecord relation
     def with_any_approvals(items)
@@ -76,14 +76,14 @@ module MergeRequests
       ])
     end
 
-    # Merge Requests approved by given usernames
+    # Merge requests approved by given usernames
     #
     # @param [ActiveRecord::Relation] items the activerecord relation
     def find_approved_by_names(items)
       items.approved_by_users_with_usernames(*usernames)
     end
 
-    # Merge Requests approved by given user IDs
+    # Merge requests approved by given user IDs
     #
     # @param [ActiveRecord::Relation] items the activerecord relation
     def find_approved_by_ids(items)

app/graphql/types/merge_request_state_enum.rb

@@ -5,6 +5,6 @@ module Types
     graphql_name 'MergeRequestState'
     description 'State of a GitLab merge request'
 
-    value 'merged', description: "Merge Request has been merged."
+    value 'merged', description: "Merge request has been merged."
   end
 end

app/graphql/types/user_type.rb

@@ -83,13 +83,13 @@ module Types
     # Merge request field: MRs can be authored, assigned, or assigned-for-review:
     field :authored_merge_requests,
           resolver: Resolvers::AuthoredMergeRequestsResolver,
-          description: 'Merge Requests authored by the user.'
+          description: 'Merge requests authored by the user.'
     field :assigned_merge_requests,
           resolver: Resolvers::AssignedMergeRequestsResolver,
-          description: 'Merge Requests assigned to the user.'
+          description: 'Merge requests assigned to the user.'
     field :review_requested_merge_requests,
           resolver: Resolvers::ReviewRequestedMergeRequestsResolver,
-          description: 'Merge Requests assigned to the user for review.'
+          description: 'Merge requests assigned to the user for review.'
 
     field :snippets,
           description: 'Snippets authored by the user.',

app/models/timelog.rb

@@ -31,9 +31,9 @@ class Timelog < ApplicationRecord
 
   def issuable_id_is_present
     if issue_id && merge_request_id
-      errors.add(:base, _('Only Issue ID or Merge Request ID is required'))
+      errors.add(:base, _('Only Issue ID or merge request ID is required'))
     elsif issuable.nil?
-      errors.add(:base, _('Issue or Merge Request ID is required'))
+      errors.add(:base, _('Issue or merge request ID is required'))
     end
   end
 

app/presenters/dev_ops_report/metric_presenter.rb

@@ -38,7 +38,7 @@ module DevOpsReport
         ),
         Card.new(
           metric: subject,
-          title: 'Merge Requests',
+          title: 'Merge requests',
           description: 'per active user',
           feature: 'merge_requests',
           blog: 'https://8thlight.com/blog/uncle-bob/2013/02/01/The-Humble-Craftsman.html',

app/views/groups/merge_requests.html.haml

 - @can_bulk_update = can?(current_user, :admin_merge_request, @group) && @group.feature_available?(:group_bulk_edit)
 
-- page_title _("Merge Requests")
+- page_title _("Merge requests")
 
 - if @merge_requests&.size == 0
   = render 'shared/empty_states/merge_requests', project_select_button: true

app/views/shared/milestones/_milestone.html.haml

@@ -44,7 +44,7 @@
       = link_to pluralize(milestone.total_issues_count, _('Issue')), issues_path
       - if milestone.merge_requests_enabled?
         ·
-        = link_to pluralize(milestone.merge_requests_visible_to_user(current_user).size, _('Merge Request')), merge_requests_path
+        = link_to pluralize(milestone.merge_requests_visible_to_user(current_user).size, _('Merge request')), merge_requests_path
       .float-lg-right.light #{milestone.percent_complete}% complete
     .col-sm-2
       .milestone-actions.d-flex.justify-content-sm-start.justify-content-md-end

app/views/shared/milestones/_tabs.html.haml

@@ -11,7 +11,7 @@
     - if milestone.merge_requests_enabled?
       %li.nav-item
         = link_to '#tab-merge-requests', class: 'nav-link', data: { toggle: 'tab', endpoint: milestone_tab_path(milestone, 'merge_requests', show_project_name: show_project_name) } do
-          = _('Merge Requests')
+          = _('Merge requests')
           %span.badge.badge-pill= milestone.merge_requests_visible_to_user(current_user).size
     %li.nav-item
       = link_to '#tab-participants', class: 'nav-link', data: { toggle: 'tab', endpoint: milestone_tab_path(milestone, 'participants') } do

app/views/shared/projects/_project.html.haml

@@ -90,7 +90,7 @@
           - if show_merge_request_count?(disabled: !merge_requests, compact_mode: compact_mode)
             = link_to project_merge_requests_path(project),
                 class: "d-none d-xl-flex align-items-center icon-wrapper merge-requests has-tooltip",
-                title: _('Merge Requests'), data: { container: 'body', placement: 'top' } do
+                title: _('Merge requests'), data: { container: 'body', placement: 'top' } do
               = sprite_icon('git-merge', size: 14, css_class: 'gl-mr-2')
               = number_with_delimiter(project.open_merge_requests_count)
           - if show_issue_count?(disabled: !issues, compact_mode: compact_mode)

danger/pipeline/Dangerfile

@@ -3,9 +3,9 @@
 MESSAGE = <<~MESSAGE
 ## Pipeline Changes
 
-This Merge Request contains changes to the pipeline configuration for the GitLab project.
+This merge request contains changes to the pipeline configuration for the GitLab project.
 
-Please consider the effect of the changes in this Merge Request on the following:
+Please consider the effect of the changes in this merge request on the following:
 - Effects on different [pipeline types](https://docs.gitlab.com/ee/development/pipelines.html#pipelines-for-merge-requests)
 - Effects on non-canonical projects:
   - `gitlab-foss`

doc/api/graphql/reference/index.md

@@ -6543,8 +6543,8 @@ Representation of a GitLab user.
 
 | Field | Type | Description |
 | ----- | ---- | ----------- |
-| `assignedMergeRequests` | [`MergeRequestConnection`](#mergerequestconnection) | Merge Requests assigned to the user. |
-| `authoredMergeRequests` | [`MergeRequestConnection`](#mergerequestconnection) | Merge Requests authored by the user. |
+| `assignedMergeRequests` | [`MergeRequestConnection`](#mergerequestconnection) | Merge requests assigned to the user. |
+| `authoredMergeRequests` | [`MergeRequestConnection`](#mergerequestconnection) | Merge requests authored by the user. |
 | `avatarUrl` | [`String`](#string) | URL of the user's avatar. |
 | `bot` | [`Boolean!`](#boolean) | Indicates if the user is a bot. |
 | `callouts` | [`UserCalloutConnection`](#usercalloutconnection) | User callouts that belong to the user. |
@@ -6556,7 +6556,7 @@ Representation of a GitLab user.
 | `name` | [`String!`](#string) | Human-readable name of the user. |
 | `projectMemberships` | [`ProjectMemberConnection`](#projectmemberconnection) | Project memberships of the user. |
 | `publicEmail` | [`String`](#string) | User's public email. |
-| `reviewRequestedMergeRequests` | [`MergeRequestConnection`](#mergerequestconnection) | Merge Requests assigned to the user for review. |
+| `reviewRequestedMergeRequests` | [`MergeRequestConnection`](#mergerequestconnection) | Merge requests assigned to the user for review. |
 | `snippets` | [`SnippetConnection`](#snippetconnection) | Snippets authored by the user. |
 | `starredProjects` | [`ProjectConnection`](#projectconnection) | Projects starred by the user. |
 | `state` | [`UserState!`](#userstate) | State of the user. |
@@ -7833,7 +7833,7 @@ State of a GitLab merge request.
 | `all` | All available. |
 | `closed` | In closed state. |
 | `locked` | Discussion has been locked. |
-| `merged` | Merge Request has been merged. |
+| `merged` | Merge request has been merged. |
 | `opened` | In open state. |
 
 ### `MergeStrategyEnum`

lib/banzai/filter/abstract_reference_filter.rb

@@ -2,7 +2,7 @@
 
 module Banzai
   module Filter
-    # Issues, Merge Requests, Snippets, Commits and Commit Ranges share
+    # Issues, merge requests, Snippets, Commits and Commit Ranges share
     # similar functionality in reference filtering.
     class AbstractReferenceFilter < ReferenceFilter
       include CrossProjectReference

lib/support/nginx/gitlab

@@ -7,8 +7,8 @@
 ##        CONTRIBUTING          ##
 ##################################
 ##
-## If you change this file in a Merge Request, please also create
-## a Merge Request on https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests
+## If you change this file in a merge request, please also create
+## a merge request on https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests
 ##
 ###################################
 ##         configuration         ##

lib/support/nginx/gitlab-ssl

@@ -11,8 +11,8 @@
 ##        CONTRIBUTING          ##
 ##################################
 ##
-## If you change this file in a Merge Request, please also create
-## a Merge Request on https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests
+## If you change this file in a merge request, please also create
+## a merge request on https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests
 ##
 ###################################
 ##         configuration         ##

locale/gitlab.pot

@@ -17282,7 +17282,7 @@ msgstr ""
 msgid "Issue label"
 msgstr ""
 
-msgid "Issue or Merge Request ID is required"
+msgid "Issue or merge request ID is required"
 msgstr ""
 
 msgid "Issue published on status page."
@@ -21779,7 +21779,7 @@ msgstr ""
 msgid "Only 1 appearances row can exist"
 msgstr ""
 
-msgid "Only Issue ID or Merge Request ID is required"
+msgid "Only Issue ID or merge request ID is required"
 msgstr ""
 
 msgid "Only Project Members"

spec/features/dashboard/milestones_spec.rb

@@ -30,7 +30,7 @@ RSpec.describe 'Dashboard > Milestones' do
       expect(current_path).to eq dashboard_milestones_path
       expect(page).to have_content(milestone.title)
       expect(page).to have_content(group.name)
-      expect(first('.milestone')).to have_content('Merge Requests')
+      expect(first('.milestone')).to have_content('Merge requests')
     end
 
     describe 'new milestones dropdown', :js do

spec/features/groups/milestone_spec.rb

@@ -133,7 +133,7 @@ RSpec.describe 'Group milestones' do
           href: project_issues_path(project, milestone_title: 'v1.0')
         )
         expect(page).to have_link(
-          '0 Merge Requests',
+          '0 Merge requests',
           href: project_merge_requests_path(project, milestone_title: 'v1.0')
         )
         expect(page).to have_link(
@@ -145,7 +145,7 @@ RSpec.describe 'Group milestones' do
           href: issues_group_path(group, milestone_title: 'GL-113')
         )
         expect(page).to have_link(
-          '0 Merge Requests',
+          '0 Merge requests',
           href: merge_requests_group_path(group, milestone_title: 'GL-113')
         )
       end
@@ -179,7 +179,7 @@ RSpec.describe 'Group milestones' do
 
       it 'renders the merge requests tab' do
         within('.js-milestone-tabs') do
-          click_link('Merge Requests')
+          click_link('Merge requests')
         end
 
         within('#tab-merge-requests') do

spec/features/milestones/user_views_milestone_spec.rb

@@ -98,7 +98,7 @@ RSpec.describe "User views milestone" do
         visit(project_milestone_path(project, milestone))
 
         within('.js-milestone-tabs') do
-          click_link('Merge Requests')
+          click_link('Merge requests')
         end
 
         wait_for_requests
@@ -116,7 +116,7 @@ RSpec.describe "User views milestone" do
         visit(group_milestone_path(group, group_milestone))
 
         within('.js-milestone-tabs') do
-          click_link('Merge Requests')
+          click_link('Merge requests')
         end
 
         expect(page.find('#tab-merge-requests')).to have_text(project.name)

spec/features/milestones/user_views_milestones_spec.rb

@@ -18,7 +18,7 @@ RSpec.describe "User views milestones" do
     expect(page).to have_content(milestone.title)
       .and have_content(milestone.expires_at)
       .and have_content("Issues")
-      .and have_content("Merge Requests")
+      .and have_content("Merge requests")
   end
 
   context "with issues", :js do
@@ -80,7 +80,6 @@ RSpec.describe "User views milestones with no MR" do
     expect(page).to have_content(milestone.title)
       .and have_content(milestone.expires_at)
       .and have_content("Issues")
-      .and have_no_content("Merge Requests")
   end
 
   it "opens milestone" do