diff --git a/ee/app/assets/javascripts/security_orchestration/components/policy_editor/scan_result/advanced_settings/constants.js b/ee/app/assets/javascripts/security_orchestration/components/policy_editor/scan_result/advanced_settings/constants.js index 3fe7d5055f9d060d4b166d06db6a7c226396f2c6..080a61d783ecac9acdbe527beade10a2d46d5471 100644 --- a/ee/app/assets/javascripts/security_orchestration/components/policy_editor/scan_result/advanced_settings/constants.js +++ b/ee/app/assets/javascripts/security_orchestration/components/policy_editor/scan_result/advanced_settings/constants.js @@ -7,5 +7,5 @@ export const OPEN = 'open'; export const UNBLOCK_RULES_KEY = 'unblock_rules_using_execution_policies'; export const UNBLOCK_RULES_TEXT = s__( - 'ScanResultPolicy|Make approval rules optional using scan execution policies', + 'ScanResultPolicy|Make approval rules optional using execution policies', ); diff --git a/ee/app/assets/javascripts/security_orchestration/components/policy_editor/scan_result/advanced_settings/edge_cases_section.vue b/ee/app/assets/javascripts/security_orchestration/components/policy_editor/scan_result/advanced_settings/edge_cases_section.vue index 431fab30bbcd2940ad9287507710d8222a30d18a..7092830bb54bbe0d365505ffcb9641099b6964d5 100644 --- a/ee/app/assets/javascripts/security_orchestration/components/policy_editor/scan_result/advanced_settings/edge_cases_section.vue +++ b/ee/app/assets/javascripts/security_orchestration/components/policy_editor/scan_result/advanced_settings/edge_cases_section.vue @@ -8,7 +8,7 @@ export default { UNBLOCK_RULES_TEXT, popoverTitle: __('Information'), popoverDesc: s__( - 'ScanResultPolicy|Automatically make approval rules optional when scan artifacts are missing from the target branch and a scan is required by a scan execution policy. This option only works with an existing scan execution policy that has matching scanners.', + 'ScanResultPolicy|When enabled, approval rules do not block merge requests when a scan is required by a scan execution policy or a pipeline execution policy but a required scan artifact is missing from the target branch. This option only works when the project or group has an existing scan execution policy or pipeline execution policy with matching scanners.', ), }, components: { diff --git a/ee/spec/frontend/security_orchestration/components/policy_editor/scan_result/advanced_settings/edge_cases_section_spec.js b/ee/spec/frontend/security_orchestration/components/policy_editor/scan_result/advanced_settings/edge_cases_section_spec.js index b18357fcf2df880fa848d95939c1df710f0c6784..c376063f857d1606b624b018e976031d79b7c41f 100644 --- a/ee/spec/frontend/security_orchestration/components/policy_editor/scan_result/advanced_settings/edge_cases_section_spec.js +++ b/ee/spec/frontend/security_orchestration/components/policy_editor/scan_result/advanced_settings/edge_cases_section_spec.js @@ -21,7 +21,7 @@ describe('EdgeCasesSection', () => { it('renders the checkbox', () => { expect(findCheckbox().text()).toContain( - 'Make approval rules optional using scan execution policies', + 'Make approval rules optional using execution policies', ); expect(findCheckbox().attributes('checked')).toBeUndefined(); }); diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 6732251cb95e1a24d45f3387a38b6463e80e32b6..59af46e02ee850b833b4841dd213fac062fe1d8b 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -51362,9 +51362,6 @@ msgstr "" msgid "ScanResultPolicy|Attributes are automatically applied by the scanners" msgstr "" -msgid "ScanResultPolicy|Automatically make approval rules optional when scan artifacts are missing from the target branch and a scan is required by a scan execution policy. This option only works with an existing scan execution policy that has matching scanners." -msgstr "" - msgid "ScanResultPolicy|Block the merge request until all criteria are met" msgstr "" @@ -51467,7 +51464,7 @@ msgstr "" msgid "ScanResultPolicy|License type" msgstr "" -msgid "ScanResultPolicy|Make approval rules optional using scan execution policies" +msgid "ScanResultPolicy|Make approval rules optional using execution policies" msgstr "" msgid "ScanResultPolicy|Matching" @@ -51599,6 +51596,9 @@ msgstr "" msgid "ScanResultPolicy|When a security policy fails for an unspecified reason." msgstr "" +msgid "ScanResultPolicy|When enabled, approval rules do not block merge requests when a scan is required by a scan execution policy or a pipeline execution policy but a required scan artifact is missing from the target branch. This option only works when the project or group has an existing scan execution policy or pipeline execution policy with matching scanners." +msgstr "" + msgid "ScanResultPolicy|When enabled, if an MR receives all necessary approvals to merge, but then a new commit is added, new approvals are required." msgstr ""