diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-10-04 18:09:33 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-10-04 18:09:33 +0300 |
| commit | bf6d126a58a66a11b2e4b9de89986174a1885105 (patch) | |
| tree | bf2912b22073ed86969a56935d81cae0b73e710b /app/assets/javascripts/security_configuration | |
| parent | 7928b47c8e06c1ac3f63d321a73dd527aea4e4c3 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/security_configuration')
| -rw-r--r-- | app/assets/javascripts/security_configuration/components/app.vue | 4 | ||||
| -rw-r--r-- | app/assets/javascripts/security_configuration/components/upgrade_banner.vue | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/app/assets/javascripts/security_configuration/components/app.vue b/app/assets/javascripts/security_configuration/components/app.vue index ecde9235e93..4fb70a92254 100644 --- a/app/assets/javascripts/security_configuration/components/app.vue +++ b/app/assets/javascripts/security_configuration/components/app.vue @@ -21,7 +21,9 @@ export const i18n = { ), description: s__( `SecurityConfiguration|Once you've enabled a scan for the default branch, - any subsequent feature branch you create will include the scan.`, + any subsequent feature branch you create will include the scan. An enabled + scanner will not be reflected as such until the pipeline has been + successfully executed and it has generated valid artifacts.`, ), securityConfiguration: __('Security Configuration'), vulnerabilityManagement: s__('SecurityConfiguration|Vulnerability Management'), diff --git a/app/assets/javascripts/security_configuration/components/upgrade_banner.vue b/app/assets/javascripts/security_configuration/components/upgrade_banner.vue index 891d7bf2eb0..eaff1ce6055 100644 --- a/app/assets/javascripts/security_configuration/components/upgrade_banner.vue +++ b/app/assets/javascripts/security_configuration/components/upgrade_banner.vue @@ -22,7 +22,7 @@ export default { s__('SecurityConfiguration|High-level vulnerability statistics across projects and groups'), s__('SecurityConfiguration|Runtime security metrics for application environments'), s__( - 'SecurityConfiguration|More scan types, including Container Scanning, DAST, Dependency Scanning, Fuzzing, and Licence Compliance', + 'SecurityConfiguration|More scan types, including DAST, Dependency Scanning, Fuzzing, and Licence Compliance', ), ], buttonText: s__('SecurityConfiguration|Upgrade or start a free trial'), |