Merge branch '233449-aqualls-caps-again' into 'master'

Fix capitalization of merge requests

See merge request gitlab-org/gitlab!58816

app/assets/javascripts/admin/statistics_panel/constants.js

@@ -3,7 +3,7 @@ import { s__ } from '~/locale';
 const statisticsLabels = {
   forks: s__('AdminStatistics|Forks'),
   issues: s__('AdminStatistics|Issues'),
-  mergeRequests: s__('AdminStatistics|Merge Requests'),
+  mergeRequests: s__('AdminStatistics|Merge requests'),
   notes: s__('AdminStatistics|Notes'),
   snippets: s__('AdminStatistics|Snippets'),
   sshKeys: s__('AdminStatistics|SSH Keys'),

app/assets/javascripts/analytics/usage_trends/components/charts_config.js

@@ -83,7 +83,7 @@ export default [
       'UsageTrends|Could not load the issues and merge requests chart. Please refresh the page to try again.',
     ),
     noDataMessage,
-    chartTitle: s__('UsageTrends|Issues & Merge Requests'),
+    chartTitle: s__('UsageTrends|Issues & merge requests'),
     yAxisTitle: s__('UsageTrends|Items'),
     xAxisTitle: s__('UsageTrends|Month'),
     queries: [

app/assets/javascripts/analytics/usage_trends/components/usage_counts.vue

@@ -45,7 +45,7 @@ export default {
       projects: s__('UsageTrends|Projects'),
       groups: s__('UsageTrends|Groups'),
       issues: s__('UsageTrends|Issues'),
-      mergeRequests: s__('UsageTrends|Merge Requests'),
+      mergeRequests: s__('UsageTrends|Merge requests'),
       pipelines: s__('UsageTrends|Pipelines'),
     },
     loadCountsError: s__('Could not load usage counts. Please refresh the page to try again.'),

app/assets/javascripts/api.js

@@ -283,7 +283,7 @@ const Api = {
   },
 
   /**
-   * Get all Merge Requests for a project, eventually filtering based on
+   * Get all merge requests for a project, eventually filtering based on
    * supplied parameters
    * @param projectPath
    * @param params
@@ -307,7 +307,7 @@ const Api = {
     return axios.post(url, options);
   },
 
-  // Return Merge Request for project
+  // Return merge request for project
   projectMergeRequest(projectPath, mergeRequestId, params = {}) {
     const url = Api.buildUrl(Api.projectMergeRequestPath)
       .replace(':id', encodeURIComponent(projectPath))

app/assets/javascripts/behaviors/shortcuts/keybindings.js

@@ -559,19 +559,19 @@ export const PROJECT_FILES_SHORTCUTS_GROUP = {
 
 export const ISSUABLE_SHORTCUTS_GROUP = {
   id: 'issuables',
-  name: __('Epics, Issues, and Merge Requests'),
+  name: __('Epics, issues, and merge requests'),
   keybindings: [ISSUABLE_COMMENT_OR_REPLY, ISSUABLE_EDIT_DESCRIPTION, ISSUABLE_CHANGE_LABEL],
 };
 
 export const ISSUE_MR_SHORTCUTS_GROUP = {
   id: 'issuesMRs',
-  name: __('Issues and Merge Requests'),
+  name: __('Issues and merge requests'),
   keybindings: [ISSUE_MR_CHANGE_ASSIGNEE, ISSUE_MR_CHANGE_MILESTONE],
 };
 
 export const MR_SHORTCUTS_GROUP = {
   id: 'mergeRequests',
-  name: __('Merge Requests'),
+  name: __('Merge requests'),
   keybindings: [
     MR_NEXT_FILE_IN_DIFF,
     MR_PREVIOUS_FILE_IN_DIFF,
@@ -584,7 +584,7 @@ export const MR_SHORTCUTS_GROUP = {
 
 export const MR_COMMITS_SHORTCUTS_GROUP = {
   id: 'mergeRequestCommits',
-  name: __('Merge Request Commits'),
+  name: __('Merge request commits'),
   keybindings: [MR_COMMITS_NEXT_COMMIT, MR_COMMITS_PREVIOUS_COMMIT],
 };
 

app/assets/javascripts/behaviors/shortcuts/shortcuts_help.vue

@@ -397,7 +397,7 @@ export default {
           <tbody>
             <tr>
               <th></th>
-              <th>{{ __('Epics, Issues, and Merge Requests') }}</th>
+              <th>{{ __('Epics, issues, and merge requests') }}</th>
             </tr>
             <tr>
               <td class="shortcut">
@@ -421,7 +421,7 @@ export default {
           <tbody>
             <tr>
               <th></th>
-              <th>{{ __('Issues and Merge Requests') }}</th>
+              <th>{{ __('Issues and merge requests') }}</th>
             </tr>
             <tr>
               <td class="shortcut">
@@ -439,7 +439,7 @@ export default {
           <tbody>
             <tr>
               <th></th>
-              <th>{{ __('Merge Requests') }}</th>
+              <th>{{ __('Merge requests') }}</th>
             </tr>
             <tr>
               <td class="shortcut">
@@ -485,7 +485,7 @@ export default {
           <tbody>
             <tr>
               <th></th>
-              <th>{{ __('Merge Request Commits') }}</th>
+              <th>{{ __('Merge request commits') }}</th>
             </tr>
             <tr>
               <td class="shortcut">

app/assets/javascripts/commit/pipelines/pipelines_bundle.js

@@ -5,8 +5,8 @@ import CommitPipelinesTable from './pipelines_table.vue';
  * Used in:
  *  - Project Pipelines List (projects:pipelines:index)
  *  - Commit details View > Pipelines Tab > Pipelines Table (projects:commit:pipelines)
- *  - Merge Request details View > Pipelines Tab > Pipelines Table (projects:merge_requests:show)
- *  - New Merge Request View > Pipelines Tab > Pipelines Table (projects:merge_requests:creations:new)
+ *  - Merge request details View > Pipelines Tab > Pipelines Table (projects:merge_requests:show)
+ *  - New merge request View > Pipelines Tab > Pipelines Table (projects:merge_requests:creations:new)
  */
 export default () => {
   const pipelineTableViewEl = document.querySelector('#commit-pipeline-table-view');

app/assets/javascripts/create_merge_request_dropdown.js

@@ -171,7 +171,7 @@ export default class CreateMergeRequestDropdown {
       })
       .catch(() =>
         createFlash({
-          message: __('Failed to create Merge Request. Please try again.'),
+          message: __('Failed to create merge request. Please try again.'),
         }),
       );
   }

app/assets/javascripts/ide/components/nav_dropdown_button.vue

@@ -36,7 +36,7 @@ export default {
         <gl-icon :size="16" :aria-label="__('Current Branch')" name="branch" /> {{ branchLabel }}
       </span>
       <span v-if="showMergeRequests" class="col-5 pl-0 text-truncate">
-        <gl-icon :size="16" :aria-label="__('Merge Request')" name="merge-request" />
+        <gl-icon :size="16" :aria-label="__('Merge request')" name="merge-request" />
         {{ mergeRequestLabel }}
       </span>
     </span>

app/assets/javascripts/ide/components/nav_form.vue

@@ -26,7 +26,7 @@ export default {
       <gl-tab :title="__('Branches')">
         <branches-search-list />
       </gl-tab>
-      <gl-tab :title="__('Merge Requests')">
+      <gl-tab :title="__('Merge requests')">
         <merge-request-search-list />
       </gl-tab>
     </gl-tabs>

app/assets/javascripts/ide/constants.js

@@ -110,5 +110,5 @@ export const SIDE_RIGHT = 'right';
 export const LIVE_PREVIEW_DEBOUNCE = 2000;
 
 // This is the maximum number of files to auto open when opening the Web IDE
-// from a Merge Request
+// from a merge request
 export const MAX_MR_FILES_AUTO_OPEN = 10;

app/assets/javascripts/ide/lib/languages/README.md

@@ -16,6 +16,6 @@ Should you be willing to help us and add support to GitLab for any missing langu
     - Example: The [`vue.js`](./vue.js) file in the current directory adds support for Vue.js Syntax Highlighting.
 4. Add tests for the new language implementation in `spec/frontend/ide/lib/languages/{langaugeName}.js`.
     - Example: See [`vue_spec.js`](spec/frontend/ide/lib/languages/vue_spec.js).
-5. Create a [Merge Request](https://docs.gitlab.com/ee/user/project/merge_requests/creating_merge_requests.html) with your newly added language.
+5. Create a [merge request](https://docs.gitlab.com/ee/user/project/merge_requests/creating_merge_requests.html) with your newly added language.
 
 Thank you!

app/assets/javascripts/ide/stores/actions/merge_request.js

@@ -73,7 +73,7 @@ export const getMergeRequestData = (
             actionText: __('Please try again'),
             actionPayload: { projectId, mergeRequestId, force },
           });
-          reject(new Error(`Merge Request not loaded ${projectId}`));
+          reject(new Error(`Merge request not loaded ${projectId}`));
         });
     } else {
       resolve(state.projects[projectId].mergeRequests[mergeRequestId]);
@@ -106,7 +106,7 @@ export const getMergeRequestChanges = (
             actionText: __('Please try again'),
             actionPayload: { projectId, mergeRequestId, force },
           });
-          reject(new Error(`Merge Request Changes not loaded ${projectId}`));
+          reject(new Error(`Merge request changes not loaded ${projectId}`));
         });
     } else {
       resolve(state.projects[projectId].mergeRequests[mergeRequestId].changes);
@@ -140,7 +140,7 @@ export const getMergeRequestVersions = (
             actionText: __('Please try again'),
             actionPayload: { projectId, mergeRequestId, force },
           });
-          reject(new Error(`Merge Request Versions not loaded ${projectId}`));
+          reject(new Error(`Merge request versions not loaded ${projectId}`));
         });
     } else {
       resolve(state.projects[projectId].mergeRequests[mergeRequestId].versions);

app/assets/javascripts/ide/stores/mutation_types.js

@@ -10,7 +10,7 @@ export const SET_PROJECT = 'SET_PROJECT';
 export const SET_CURRENT_PROJECT = 'SET_CURRENT_PROJECT';
 export const TOGGLE_EMPTY_STATE = 'TOGGLE_EMPTY_STATE';
 
-// Merge Request Mutation Types
+// Merge request mutation types
 export const SET_MERGE_REQUEST = 'SET_MERGE_REQUEST';
 export const SET_CURRENT_MERGE_REQUEST = 'SET_CURRENT_MERGE_REQUEST';
 export const SET_MERGE_REQUEST_CHANGES = 'SET_MERGE_REQUEST_CHANGES';

app/assets/javascripts/merge_request_tabs.js

@@ -264,7 +264,7 @@ export default class MergeRequestTabs {
     }
   }
 
-  // Replaces the current Merge Request-specific action in the URL with a new one
+  // Replaces the current merge request-specific action in the URL with a new one
   //
   // If the action is "notes", the URL is reset to the standard
   // `MergeRequests#show` route.

app/assets/javascripts/notes.js

@@ -106,7 +106,7 @@ export default class Notes {
     this.collapseLongCommitList();
     this.setViewType(view);
 
-    // We are in the Merge Requests page so we need another edit form for Changes tab
+    // We are in the merge requests page so we need another edit form for Changes tab
     if (getPagePath(1) === 'merge_requests') {
       $('.note-edit-form').clone().addClass('mr-note-edit-form').insertAfter('.note-edit-form');
     }

app/assets/javascripts/pipelines/mixins/pipelines_mixin.js

@@ -190,7 +190,7 @@ export default {
         .then(() => this.updateTable())
         .catch(() => {
           createFlash(
-            __('An error occurred while trying to run a new pipeline for this Merge Request.'),
+            __('An error occurred while trying to run a new pipeline for this merge request.'),
           );
         })
         .finally(() => this.store.toggleIsRunningPipeline(false));

app/assets/javascripts/releases/components/release_block_milestone_info.vue

@@ -179,7 +179,7 @@ export default {
     />
     <issuable-stats
       v-if="showMergeRequestStats"
-      :label="__('Merge Requests')"
+      :label="__('Merge requests')"
       :total="mergeRequestCounts.total"
       :merged="mergeRequestCounts.merged"
       :closed="mergeRequestCounts.closed"

app/assets/javascripts/security_configuration/components/manage_sast.vue

@@ -54,6 +54,6 @@ export default {
 
 <template>
   <gl-button :loading="isLoading" variant="success" category="secondary" @click="mutate">{{
-    s__('SecurityConfiguration|Configure via Merge Request')
+    s__('SecurityConfiguration|Configure via merge request')
   }}</gl-button>
 </template>

app/assets/stylesheets/framework/variables.scss

@@ -924,7 +924,7 @@ Issue Analytics
 $issues-analytics-popover-boarder-color: rgba(0, 0, 0, 0.15);
 
 /*
-Merge Requests
+Merge requests
 */
 $mr-tabs-height: 48px;
 $mr-version-controls-height: 56px;

app/helpers/preferences_helper.rb

@@ -33,7 +33,7 @@ module PreferencesHelper
       groups: _("Your Groups"),
       todos: _("Your To-Do List"),
       issues: _("Assigned Issues"),
-      merge_requests: _("Assigned Merge Requests"),
+      merge_requests: _("Assigned merge requests"),
       operations: _("Operations Dashboard")
     }.with_indifferent_access.freeze
   end

app/helpers/search_helper.rb

@@ -193,7 +193,7 @@ module SearchHelper
         { category: "In this project", label: _("Network"),        url: project_network_path(@project, ref) },
         { category: "In this project", label: _("Graph"),          url: project_graph_path(@project, ref) },
         { category: "In this project", label: _("Issues"),         url: project_issues_path(@project) },
-        { category: "In this project", label: _("Merge Requests"), url: project_merge_requests_path(@project) },
+        { category: "In this project", label: _("Merge requests"), url: project_merge_requests_path(@project) },
         { category: "In this project", label: _("Milestones"),     url: project_milestones_path(@project) },
         { category: "In this project", label: _("Snippets"),       url: project_snippets_path(@project) },
         { category: "In this project", label: _("Members"),        url: project_project_members_path(@project) },

app/helpers/todos_helper.rb

@@ -161,7 +161,7 @@ module TodosHelper
     [
       { id: '', text: 'Any Type' },
       { id: 'Issue', text: 'Issue' },
-      { id: 'MergeRequest', text: 'Merge Request' },
+      { id: 'MergeRequest', text: 'Merge request' },
       { id: 'DesignManagement::Design', text: 'Design' },
       { id: 'AlertManagement::Alert', text: 'Alert' }
     ]

app/services/system_note_service.rb

@@ -7,7 +7,7 @@
 module SystemNoteService
   extend self
 
-  # Called when commits are added to a Merge Request
+  # Called when commits are added to a merge request
   #
   # noteable         - Noteable object
   # project          - Project owning noteable

app/services/system_notes/commit_service.rb

@@ -2,7 +2,7 @@
 
 module SystemNotes
   class CommitService < ::SystemNotes::BaseService
-    # Called when commits are added to a Merge Request
+    # Called when commits are added to a merge request
     #
     # new_commits      - Array of Commits added since last push
     # existing_commits - Array of Commits added in a previous push

app/views/events/event/_push.html.haml

@@ -46,4 +46,4 @@
       - elsif create_mr
         %li.commits-stat
           = link_to create_mr_path do
-            Create Merge Request
+            Create merge request

locale/gitlab.pot

@@ -2349,7 +2349,7 @@ msgstr ""
 msgid "AdminStatistics|Issues"
 msgstr ""
 
-msgid "AdminStatistics|Merge Requests"
+msgid "AdminStatistics|Merge requests"
 msgstr ""
 
 msgid "AdminStatistics|Milestones"
@@ -3626,7 +3626,7 @@ msgstr ""
 msgid "An error occurred while trying to generate the report. Please try again later."
 msgstr ""
 
-msgid "An error occurred while trying to run a new pipeline for this Merge Request."
+msgid "An error occurred while trying to run a new pipeline for this merge request."
 msgstr ""
 
 msgid "An error occurred while unsubscribing to notifications."
@@ -4263,7 +4263,7 @@ msgstr ""
 msgid "Assigned Issues"
 msgstr ""
 
-msgid "Assigned Merge Requests"
+msgid "Assigned merge requests"
 msgstr ""
 
 msgid "Assigned projects"
@@ -12213,7 +12213,7 @@ msgstr ""
 msgid "Epics let you manage your portfolio of projects more efficiently and with less effort"
 msgstr ""
 
-msgid "Epics, Issues, and Merge Requests"
+msgid "Epics, issues, and merge requests"
 msgstr ""
 
 msgid "Epics|%{startDate} – %{dueDate}"
@@ -12912,9 +12912,6 @@ msgstr ""
 msgid "Failed to clone this issue: wrong parameters."
 msgstr ""
 
-msgid "Failed to create Merge Request. Please try again."
-msgstr ""
-
 msgid "Failed to create a branch for this issue. Please try again."
 msgstr ""
 
@@ -12927,6 +12924,9 @@ msgstr ""
 msgid "Failed to create import label for jira import."
 msgstr ""
 
+msgid "Failed to create merge request. Please try again."
+msgstr ""
+
 msgid "Failed to create new project access token: %{token_response_message}"
 msgstr ""
 
@@ -17492,7 +17492,7 @@ msgstr ""
 msgid "Issues Rate Limits"
 msgstr ""
 
-msgid "Issues and Merge Requests"
+msgid "Issues and merge requests"
 msgstr ""
 
 msgid "Issues can be bugs, tasks or ideas to be discussed. Also, issues are searchable and filterable."
@@ -19437,9 +19437,6 @@ msgstr ""
 msgid "Merge Request Analytics"
 msgstr ""
 
-msgid "Merge Request Commits"
-msgstr ""
-
 msgid "Merge Requests"
 msgstr ""
 
@@ -19497,6 +19494,9 @@ msgstr ""
 msgid "Merge request approvals"
 msgstr ""
 
+msgid "Merge request commits"
+msgstr ""
+
 msgid "Merge request dependencies"
 msgstr ""
 
@@ -27410,6 +27410,9 @@ msgstr ""
 msgid "SecurityConfiguration|Configure via Merge Request"
 msgstr ""
 
+msgid "SecurityConfiguration|Configure via merge request"
+msgstr ""
+
 msgid "SecurityConfiguration|Could not retrieve configuration data. Please refresh the page, or try again later."
 msgstr ""
 
@@ -33411,13 +33414,13 @@ msgstr ""
 msgid "UsageTrends|Issues"
 msgstr ""
 
-msgid "UsageTrends|Issues & Merge Requests"
+msgid "UsageTrends|Issues & merge requests"
 msgstr ""
 
 msgid "UsageTrends|Items"
 msgstr ""
 
-msgid "UsageTrends|Merge Requests"
+msgid "UsageTrends|Merge requests"
 msgstr ""
 
 msgid "UsageTrends|Month"

spec/features/search/user_uses_header_search_field_spec.rb

@@ -175,7 +175,7 @@ RSpec.describe 'User uses header search field', :js do
         fill_in_search('Merge')
 
         within(dashboard_search_options_popup_menu) do
-          expect(page).to have_text('Merge Requests')
+          expect(page).to have_text('Merge requests')
         end
       end
 

spec/frontend/analytics/usage_trends/components/app_spec.js

@@ -24,7 +24,7 @@ describe('UsageTrendsApp', () => {
     expect(wrapper.find(UsageCounts).exists()).toBe(true);
   });
 
-  ['Total projects & groups', 'Pipelines', 'Issues & Merge Requests'].forEach((usage) => {
+  ['Total projects & groups', 'Pipelines', 'Issues & merge requests'].forEach((usage) => {
     it(`displays the ${usage} chart`, () => {
       const chartTitles = wrapper
         .findAll(UsageTrendsCountChart)

spec/frontend/releases/components/release_block_milestone_info_spec.js

@@ -199,7 +199,7 @@ describe('Release block milestone info', () => {
 
     it('renders merge request stats', () => {
       expect(trimText(mergeRequestsContainer().text())).toBe(
-        'Merge Requests 30 Open: 4 • Merged: 24 • Closed: 2',
+        'Merge requests 30 Open: 4 • Merged: 24 • Closed: 2',
       );
     });
   });

spec/frontend/security_configuration/configuration_table_spec.js

@@ -30,7 +30,7 @@ describe('Configuration Table Component', () => {
       expect(wrapper.text()).toContain(scanner.name);
       expect(wrapper.text()).toContain(scanner.description);
       if (scanner.type === REPORT_TYPE_SAST) {
-        expect(wrapper.findByTestId(scanner.type).text()).toBe('Configure via Merge Request');
+        expect(wrapper.findByTestId(scanner.type).text()).toBe('Configure via merge request');
       } else if (scanner.type !== REPORT_TYPE_SECRET_DETECTION) {
         expect(wrapper.findByTestId(scanner.type).text()).toMatchInterpolatedText(UPGRADE_CTA);
       }

spec/frontend/security_configuration/manage_sast_spec.js

@@ -79,7 +79,7 @@ describe('Manage Sast Component', () => {
 
   it('should render Button with correct text', () => {
     createComponent();
-    expect(findButton().text()).toContain('Configure via Merge Request');
+    expect(findButton().text()).toContain('Configure via merge request');
   });
 
   describe('given a successful response', () => {

spec/helpers/preferences_helper_spec.rb

@@ -33,7 +33,7 @@ RSpec.describe PreferencesHelper do
         ["Your Groups", 'groups'],
         ["Your To-Do List", 'todos'],
         ["Assigned Issues", 'issues'],
-        ["Assigned Merge Requests", 'merge_requests']
+        ["Assigned merge requests", 'merge_requests']
       ]
     end
   end