Commit 8f59ae21 authored by Jose Ivan Vargas's avatar Jose Ivan Vargas

Merge branch 'aqualls-MR-caps-in-ui-messages' into 'master'

Fix more capitalization of 'merge requests'

See merge request gitlab-org/gitlab!74347
parents bca9c5fe 3fc4e6ba
...@@ -130,14 +130,14 @@ export default { ...@@ -130,14 +130,14 @@ export default {
submissionError: s__( submissionError: s__(
'SecurityConfiguration|An error occurred while creating the merge request.', 'SecurityConfiguration|An error occurred while creating the merge request.',
), ),
submitButton: s__('SecurityConfiguration|Create Merge Request'), submitButton: s__('SecurityConfiguration|Create merge request'),
cancelButton: __('Cancel'), cancelButton: __('Cancel'),
help: __('Help'), help: __('Help'),
analyzersHeading: s__('SecurityConfiguration|SAST Analyzers'), analyzersHeading: s__('SecurityConfiguration|SAST Analyzers'),
analyzersSubHeading: s__( analyzersSubHeading: s__(
`SecurityConfiguration|By default, all analyzers are applied in order to `SecurityConfiguration|By default, all analyzers are applied in order to
cover all languages across your project, and only run if the language is cover all languages across your project, and only run if the language is
detected in the Merge Request.`, detected in the merge request.`,
), ),
analyzersTipHeading: __('We recommend leaving all SAST analyzers enabled'), analyzersTipHeading: __('We recommend leaving all SAST analyzers enabled'),
analyzersTipBody: __( analyzersTipBody: __(
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
%b= s_('StatusCheck|Status checks') %b= s_('StatusCheck|Status checks')
%p.text-secondary %p.text-secondary
- link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: help_page_path('user/project/merge_requests/status_checks') } - link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: help_page_path('user/project/merge_requests/status_checks') }
= s_('StatusCheck|Check for a status response in Merge Requests. Failures do not block merges. %{link_start}Learn more%{link_end}.').html_safe % { link_start: link_start, link_end: '</a>'.html_safe } = s_('StatusCheck|Check for a status response in merge requests. Failures do not block merges. %{link_start}Learn more%{link_end}.').html_safe % { link_start: link_start, link_end: '</a>'.html_safe }
#js-status-checks-settings{ status_checks_app_data(@project) } #js-status-checks-settings{ status_checks_app_data(@project) }
.text-center.gl-mt-3 .text-center.gl-mt-3
......
...@@ -18,7 +18,7 @@ RSpec.describe 'projects/_merge_request_status_checks_settings' do ...@@ -18,7 +18,7 @@ RSpec.describe 'projects/_merge_request_status_checks_settings' do
end end
it 'renders the settings description', :aggregate_failures do it 'renders the settings description', :aggregate_failures do
expect(rendered).to have_content 'Check for a status response in Merge Requests. Failures do not block merges.' expect(rendered).to have_content 'Check for a status response in merge requests. Failures do not block merges.'
expect(rendered).to have_link 'Learn more', href: '/help/user/project/merge_requests/status_checks' expect(rendered).to have_link 'Learn more', href: '/help/user/project/merge_requests/status_checks'
end end
......
...@@ -30609,7 +30609,7 @@ msgstr "" ...@@ -30609,7 +30609,7 @@ msgstr ""
msgid "SecurityConfiguration|Available with Ultimate" msgid "SecurityConfiguration|Available with Ultimate"
msgstr "" msgstr ""
msgid "SecurityConfiguration|By default, all analyzers are applied in order to cover all languages across your project, and only run if the language is detected in the Merge Request." msgid "SecurityConfiguration|By default, all analyzers are applied in order to cover all languages across your project, and only run if the language is detected in the merge request."
msgstr "" msgstr ""
msgid "SecurityConfiguration|Compliance" msgid "SecurityConfiguration|Compliance"
...@@ -30636,7 +30636,7 @@ msgstr "" ...@@ -30636,7 +30636,7 @@ msgstr ""
msgid "SecurityConfiguration|Could not retrieve configuration data. Please refresh the page, or try again later." msgid "SecurityConfiguration|Could not retrieve configuration data. Please refresh the page, or try again later."
msgstr "" msgstr ""
msgid "SecurityConfiguration|Create Merge Request" msgid "SecurityConfiguration|Create merge request"
msgstr "" msgstr ""
msgid "SecurityConfiguration|Customize common SAST settings to suit your requirements. Configuration changes made here override those provided by GitLab and are excluded from updates. For details of more advanced configuration options, see the %{linkStart}GitLab SAST documentation%{linkEnd}." msgid "SecurityConfiguration|Customize common SAST settings to suit your requirements. Configuration changes made here override those provided by GitLab and are excluded from updates. For details of more advanced configuration options, see the %{linkStart}GitLab SAST documentation%{linkEnd}."
...@@ -33042,7 +33042,7 @@ msgstr "" ...@@ -33042,7 +33042,7 @@ msgstr ""
msgid "StatusCheck|Apply this status check to all branches or a specific protected branch." msgid "StatusCheck|Apply this status check to all branches or a specific protected branch."
msgstr "" msgstr ""
msgid "StatusCheck|Check for a status response in Merge Requests. Failures do not block merges. %{link_start}Learn more%{link_end}." msgid "StatusCheck|Check for a status response in merge requests. Failures do not block merges. %{link_start}Learn more%{link_end}."
msgstr "" msgstr ""
msgid "StatusCheck|Examples: QA, Security." msgid "StatusCheck|Examples: QA, Security."
......
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