Commit 70f34060 authored by Martin Wortschack's avatar Martin Wortschack

Merge branch '214710-rename-configure-to-enable' into 'master'

Renamed configure to enable on security config page

See merge request gitlab-org/gitlab!31503
parents e9b5b28d 94077e59
---
title: Changed terminology of security scanner status from configure to enable
merge_request: 31503
author:
type: changed
...@@ -11,7 +11,7 @@ type: reference, howto ...@@ -11,7 +11,7 @@ type: reference, howto
The security configuration page displays the configuration state of each of the security The security configuration page displays the configuration state of each of the security
features and can be accessed through a project's sidebar nav. features and can be accessed through a project's sidebar nav.
![Screenshot of security configuration page](../img/security_configuration_page_v12_9.png) ![Screenshot of security configuration page](../img/security_configuration_page_v13_1.png)
The page uses the project's latest default branch [CI pipeline](../../../ci/pipelines/index.md) to determine the configuration The page uses the project's latest default branch [CI pipeline](../../../ci/pipelines/index.md) to determine the configuration
state of each feature. If a job with the expected security report artifact exists in the pipeline, state of each feature. If a job with the expected security report artifact exists in the pipeline,
......
...@@ -51,9 +51,9 @@ export default { ...@@ -51,9 +51,9 @@ export default {
return this.autoDevopsEnabled ? this.autoDevopsHelpPagePath : this.latestPipelinePath; return this.autoDevopsEnabled ? this.autoDevopsHelpPagePath : this.latestPipelinePath;
}, },
calloutContent() { calloutContent() {
const bodyDefault = __(`The configuration status of the table below only applies to the default branch and const bodyDefault = __(`The status of the table below only applies to the default branch and
is based on the %{linkStart}latest pipeline%{linkEnd}. is based on the %{linkStart}latest pipeline%{linkEnd}.
Once you've configured a scan for the default branch, any subsequent feature branch you create will include the scan.`); Once you've enabled a scan for the default branch, any subsequent feature branch you create will include the scan.`);
const bodyAutoDevopsEnabled = __( const bodyAutoDevopsEnabled = __(
'All security scans are enabled because %{linkStart}Auto DevOps%{linkEnd} is enabled on this project', 'All security scans are enabled because %{linkStart}Auto DevOps%{linkEnd} is enabled on this project',
...@@ -119,9 +119,7 @@ export default { ...@@ -119,9 +119,7 @@ export default {
</div> </div>
<div class="table-mobile-content"> <div class="table-mobile-content">
<div class="d-flex align-items-center justify-content-end justify-content-md-start"> <div class="d-flex align-items-center justify-content-end justify-content-md-start">
<div class="text-2 gl-text-gray-900"> <div class="text-2 gl-text-gray-900">{{ feature.name }}</div>
{{ feature.name }}
</div>
</div> </div>
<div class="text-secondary"> <div class="text-secondary">
{{ feature.description }} {{ feature.description }}
...@@ -141,8 +139,8 @@ export default { ...@@ -141,8 +139,8 @@ export default {
<div ref="featureConfigStatus" class="table-mobile-content"> <div ref="featureConfigStatus" class="table-mobile-content">
{{ {{
feature.configured feature.configured
? s__('SecurityConfiguration|Configured') ? s__('SecurityConfiguration|Enabled')
: s__('SecurityConfiguration|Not yet configured') : s__('SecurityConfiguration|Not yet enabled')
}} }}
</div> </div>
</div> </div>
......
...@@ -50,9 +50,7 @@ exports[`Security Configuration App features table displays a given feature 1`] ...@@ -50,9 +50,7 @@ exports[`Security Configuration App features table displays a given feature 1`]
<div <div
class="text-2 gl-text-gray-900" class="text-2 gl-text-gray-900"
> >
name-feature-0
name-feature-0
</div> </div>
</div> </div>
...@@ -89,7 +87,7 @@ exports[`Security Configuration App features table displays a given feature 1`] ...@@ -89,7 +87,7 @@ exports[`Security Configuration App features table displays a given feature 1`]
class="table-mobile-content" class="table-mobile-content"
> >
Not yet configured Not yet enabled
</div> </div>
</div> </div>
......
...@@ -79,8 +79,8 @@ describe('Security Configuration App', () => { ...@@ -79,8 +79,8 @@ describe('Security Configuration App', () => {
it.each` it.each`
configured | statusText configured | statusText
${true} | ${'Configured'} ${true} | ${'Enabled'}
${false} | ${'Not yet configured'} ${false} | ${'Not yet enabled'}
`( `(
`displays "$statusText" if the given feature's configuration status is: "$configured"`, `displays "$statusText" if the given feature's configuration status is: "$configured"`,
({ configured, statusText }) => { ({ configured, statusText }) => {
......
...@@ -18858,7 +18858,7 @@ msgstr "" ...@@ -18858,7 +18858,7 @@ msgstr ""
msgid "Security report is out of date. Run %{newPipelineLinkStart}a new pipeline%{newPipelineLinkEnd} for the target branch (%{targetBranchName})" msgid "Security report is out of date. Run %{newPipelineLinkStart}a new pipeline%{newPipelineLinkEnd} for the target branch (%{targetBranchName})"
msgstr "" msgstr ""
msgid "SecurityConfiguration|Configured" msgid "SecurityConfiguration|Enabled"
msgstr "" msgstr ""
msgid "SecurityConfiguration|Feature" msgid "SecurityConfiguration|Feature"
...@@ -18867,7 +18867,7 @@ msgstr "" ...@@ -18867,7 +18867,7 @@ msgstr ""
msgid "SecurityConfiguration|Feature documentation for %{featureName}" msgid "SecurityConfiguration|Feature documentation for %{featureName}"
msgstr "" msgstr ""
msgid "SecurityConfiguration|Not yet configured" msgid "SecurityConfiguration|Not yet enabled"
msgstr "" msgstr ""
msgid "SecurityConfiguration|Secure features" msgid "SecurityConfiguration|Secure features"
...@@ -21288,9 +21288,6 @@ msgstr "" ...@@ -21288,9 +21288,6 @@ msgstr ""
msgid "The commit does not exist" msgid "The commit does not exist"
msgstr "" msgstr ""
msgid "The configuration status of the table below only applies to the default branch and is based on the %{linkStart}latest pipeline%{linkEnd}. Once you've configured a scan for the default branch, any subsequent feature branch you create will include the scan."
msgstr ""
msgid "The connection will time out after %{timeout}. For repositories that take longer, use a clone/push combination." msgid "The connection will time out after %{timeout}. For repositories that take longer, use a clone/push combination."
msgstr "" msgstr ""
...@@ -21551,6 +21548,9 @@ msgstr "" ...@@ -21551,6 +21548,9 @@ msgstr ""
msgid "The staging stage shows the time between merging the MR and deploying code to the production environment. The data will be automatically added once you deploy to production for the first time." msgid "The staging stage shows the time between merging the MR and deploying code to the production environment. The data will be automatically added once you deploy to production for the first time."
msgstr "" msgstr ""
msgid "The status of the table below only applies to the default branch and is based on the %{linkStart}latest pipeline%{linkEnd}. Once you've enabled a scan for the default branch, any subsequent feature branch you create will include the scan."
msgstr ""
msgid "The testing stage shows the time GitLab CI takes to run every pipeline for the related merge request. The data will automatically be added after your first pipeline finishes running." msgid "The testing stage shows the time GitLab CI takes to run every pipeline for the related merge request. The data will automatically be added after your first pipeline finishes running."
msgstr "" msgstr ""
......
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