Skip to content
Snippets Groups Projects
Verified Commit 2bc4924c authored by Russell Dickenson's avatar Russell Dickenson Committed by GitLab
Browse files

Rename doc to merge request approval policies

parent a6dcb433
No related branches found
No related tags found
2 merge requests!164749Enable parallel in test-on-omnibus,!160676Rename doc to merge request approval policies
Showing
with 615 additions and 595 deletions
...@@ -7,4 +7,4 @@ ...@@ -7,4 +7,4 @@
issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/422414 # (required) Link to the deprecation issue in GitLab issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/422414 # (required) Link to the deprecation issue in GitLab
body: | # (required) Do not modify this line, instead modify the lines below. body: | # (required) Do not modify this line, instead modify the lines below.
In [Support additional filters for scan result policies](https://gitlab.com/groups/gitlab-org/-/epics/6826#note_1341377224), we broke the `newly_detected` field into two options: `new_needs_triage` and `new_dismissed`. By including both options in the security policy YAML, you will achieve the same result as the original `newly_detected` field. However, you may now narrow your filter to ignore findings that have been dismissed by only using `new_needs_triage`. In [Support additional filters for scan result policies](https://gitlab.com/groups/gitlab-org/-/epics/6826#note_1341377224), we broke the `newly_detected` field into two options: `new_needs_triage` and `new_dismissed`. By including both options in the security policy YAML, you will achieve the same result as the original `newly_detected` field. However, you may now narrow your filter to ignore findings that have been dismissed by only using `new_needs_triage`.
documentation_url: https://docs.gitlab.com/ee/user/application_security/policies/scan-result-policies.html#scan_finding-rule-type # (optional) This is a link to the current documentation page documentation_url: https://docs.gitlab.com/ee/user/application_security/policies/merge_request_approval_policies.html#scan_finding-rule-type # (optional) This is a link to the current documentation page
...@@ -8,4 +8,4 @@ ...@@ -8,4 +8,4 @@
body: | # (required) Do not modify this line, instead modify the lines below. body: | # (required) Do not modify this line, instead modify the lines below.
In [Support additional filters for scan result policies](https://gitlab.com/groups/gitlab-org/-/epics/6826#note_1341377224), we broke the `newly_detected` field into two options: `new_needs_triage` and `new_dismissed`. By including both options in the security policy YAML, you will achieve the same result as the original `newly_detected` field. However, you may now narrow your filter to ignore findings that have been dismissed by only using `new_needs_triage`. In [Support additional filters for scan result policies](https://gitlab.com/groups/gitlab-org/-/epics/6826#note_1341377224), we broke the `newly_detected` field into two options: `new_needs_triage` and `new_dismissed`. By including both options in the security policy YAML, you will achieve the same result as the original `newly_detected` field. However, you may now narrow your filter to ignore findings that have been dismissed by only using `new_needs_triage`.
Based on discussion in [epic 10203](https://gitlab.com/groups/gitlab-org/-/epics/10203#note_1545826313), we have changed the name of the `match_on_inclusion` field to `match_on_inclusion_license` for more clarity in the YAML definition. Based on discussion in [epic 10203](https://gitlab.com/groups/gitlab-org/-/epics/10203#note_1545826313), we have changed the name of the `match_on_inclusion` field to `match_on_inclusion_license` for more clarity in the YAML definition.
documentation_url: https://docs.gitlab.com/ee/user/application_security/policies/scan-result-policies.html#scan_finding-rule-type # (optional) This is a link to the current documentation page documentation_url: https://docs.gitlab.com/ee/user/application_security/policies/merge_request_approval_policies.html#scan_finding-rule-type # (optional) This is a link to the current documentation page
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
self-managed: true self-managed: true
gitlab-com: true gitlab-com: true
available_in: [Ultimate] available_in: [Ultimate]
documentation_link: 'https://docs.gitlab.com/ee/user/application_security/policies/scan-result-policies.html' documentation_link: 'https://docs.gitlab.com/ee/user/application_security/policies/merge_request_approval_policies.html'
image_url: 'https://img.youtube.com/vi/jfbNo5IE-2s/hqdefault.jpg' image_url: 'https://img.youtube.com/vi/jfbNo5IE-2s/hqdefault.jpg'
published_at: 2022-11-22 published_at: 2022-11-22
release: 15.6 release: 15.6
......
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
self-managed: true self-managed: true
gitlab-com: true gitlab-com: true
available_in: [Ultimate] available_in: [Ultimate]
documentation_link: https://docs.gitlab.com/ee/user/application_security/policies/scan-result-policies.html documentation_link: https://docs.gitlab.com/ee/user/application_security/policies/merge_request_approval_policies.html
image_url: https://about.gitlab.com/images/16_3/security-policy-filters-compressed.png image_url: https://about.gitlab.com/images/16_3/security-policy-filters-compressed.png
published_at: 2023-08-22 published_at: 2023-08-22
release: 16.3 release: 16.3
......
...@@ -45,7 +45,7 @@ compliance: ...@@ -45,7 +45,7 @@ compliance:
|:------------------------------------------------------------------------------------|:-----------------------|:-----------------------|:-----------------------|:-------------------------------------------------------------------------------------------| |:------------------------------------------------------------------------------------|:-----------------------|:-----------------------|:-----------------------|:-------------------------------------------------------------------------------------------|
| [Compliance frameworks](../user/group/compliance_frameworks.md) | **{dotted-circle}** No | **{check-circle}** Yes | **{dotted-circle}** No | Describe the type of compliance requirements projects must follow. | | [Compliance frameworks](../user/group/compliance_frameworks.md) | **{dotted-circle}** No | **{check-circle}** Yes | **{dotted-circle}** No | Describe the type of compliance requirements projects must follow. |
| [Compliance pipelines](../user/group/compliance_pipelines.md) | **{dotted-circle}** No | **{check-circle}** Yes | **{dotted-circle}** No | Define a pipeline configuration to run for any projects with a given compliance framework. | | [Compliance pipelines](../user/group/compliance_pipelines.md) | **{dotted-circle}** No | **{check-circle}** Yes | **{dotted-circle}** No | Define a pipeline configuration to run for any projects with a given compliance framework. |
| [Merge request approval policy approval settings](../user/application_security/policies/scan-result-policies.md#approval_settings) | **{dotted-circle}** Yes | **{check-circle}** Yes | **{dotted-circle}** Yes | Enforce a merge request approval policy enforcing multiple approvers and override various project settings in all enforced groups or projects across your GitLab instance or group. | | [Merge request approval policy approval settings](../user/application_security/policies/merge_request_approval_policies.md#approval_settings) | **{dotted-circle}** Yes | **{check-circle}** Yes | **{dotted-circle}** Yes | Enforce a merge request approval policy enforcing multiple approvers and override various project settings in all enforced groups or projects across your GitLab instance or group. |
## Audit management ## Audit management
......
...@@ -120,7 +120,7 @@ Supported attributes: ...@@ -120,7 +120,7 @@ Supported attributes:
| `approvals_required` | integer | Yes | The number of required approvals for this rule. | | `approvals_required` | integer | Yes | The number of required approvals for this rule. |
| `name` | string | Yes | The name of the approval rule. | | `name` | string | Yes | The name of the approval rule. |
| `group_ids` | array | No | The IDs of groups as approvers. | | `group_ids` | array | No | The IDs of groups as approvers. |
| `rule_type` | string | No | The rule type. `any_approver` is a pre-configured default rule with `approvals_required` at `0`. Other rules are `regular` (used for regular [merge request approval rules](../user/project/merge_requests/approvals/rules.md)) and `report_approver`. Don't use this field to build approval rules from the API. The `report_approver` field is used when GitLab creates an approval rule from configured and enabled [merge request approval policies](../user/application_security/policies/scan-result-policies.md). | | `rule_type` | string | No | The rule type. `any_approver` is a pre-configured default rule with `approvals_required` at `0`. Other rules are `regular` (used for regular [merge request approval rules](../user/project/merge_requests/approvals/rules.md)) and `report_approver`. Don't use this field to build approval rules from the API. The `report_approver` field is used when GitLab creates an approval rule from configured and enabled [merge request approval policies](../user/application_security/policies/merge_request_approval_policies.md). |
| `user_ids` | array | No | The IDs of users as approvers. | | `user_ids` | array | No | The IDs of users as approvers. |
Example request: Example request:
...@@ -195,7 +195,7 @@ Supported attributes: ...@@ -195,7 +195,7 @@ Supported attributes:
| `approvals_required` | string | No | The number of required approvals for this rule. | | `approvals_required` | string | No | The number of required approvals for this rule. |
| `group_ids` | integer | No | The IDs of users as approvers. | | `group_ids` | integer | No | The IDs of users as approvers. |
| `name` | string | No | The name of the approval rule. | | `name` | string | No | The name of the approval rule. |
| `rule_type` | array | No | The rule type. `any_approver` is a pre-configured default rule with `approvals_required` at `0`. Other rules are `regular` (used for regular [merge request approval rules](../user/project/merge_requests/approvals/rules.md)) and `report_approver`. Don't use this field to build approval rules from the API. The `report_approver` field is used when GitLab creates an approval rule from configured and enabled [merge request approval policies](../user/application_security/policies/scan-result-policies.md). | | `rule_type` | array | No | The rule type. `any_approver` is a pre-configured default rule with `approvals_required` at `0`. Other rules are `regular` (used for regular [merge request approval rules](../user/project/merge_requests/approvals/rules.md)) and `report_approver`. Don't use this field to build approval rules from the API. The `report_approver` field is used when GitLab creates an approval rule from configured and enabled [merge request approval policies](../user/application_security/policies/merge_request_approval_policies.md). |
| `user_ids` | array | No | The IDs of groups as approvers. | | `user_ids` | array | No | The IDs of groups as approvers. |
Example request: Example request:
...@@ -628,7 +628,7 @@ Supported attributes: ...@@ -628,7 +628,7 @@ Supported attributes:
| `group_ids` | Array | No | The IDs of groups as approvers. | | `group_ids` | Array | No | The IDs of groups as approvers. |
| `protected_branch_ids` | Array | No | The IDs of protected branches to scope the rule by. To identify the ID, [use the API](protected_branches.md#list-protected-branches). | | `protected_branch_ids` | Array | No | The IDs of protected branches to scope the rule by. To identify the ID, [use the API](protected_branches.md#list-protected-branches). |
| `report_type` | string | No | The report type required when the rule type is `report_approver`. The supported report types are `license_scanning` [(Deprecated in GitLab 15.9)](../update/deprecations.md#license-check-and-the-policies-tab-on-the-license-compliance-page) and `code_coverage`. | | `report_type` | string | No | The report type required when the rule type is `report_approver`. The supported report types are `license_scanning` [(Deprecated in GitLab 15.9)](../update/deprecations.md#license-check-and-the-policies-tab-on-the-license-compliance-page) and `code_coverage`. |
| `rule_type` | string | No | The rule type. `any_approver` is a pre-configured default rule with `approvals_required` at `0`. Other rules are `regular` (used for regular [merge request approval rules](../user/project/merge_requests/approvals/rules.md)) and `report_approver`. Don't use this field to build approval rules from the API. The `report_approver` field is used when GitLab creates an approval rule from configured and enabled [merge request approval policies](../user/application_security/policies/scan-result-policies.md). | | `rule_type` | string | No | The rule type. `any_approver` is a pre-configured default rule with `approvals_required` at `0`. Other rules are `regular` (used for regular [merge request approval rules](../user/project/merge_requests/approvals/rules.md)) and `report_approver`. Don't use this field to build approval rules from the API. The `report_approver` field is used when GitLab creates an approval rule from configured and enabled [merge request approval policies](../user/application_security/policies/merge_request_approval_policies.md). |
| `user_ids` | Array | No | The IDs of users as approvers. If you provide both `user_ids` and `usernames`, it adds both lists of users. | | `user_ids` | Array | No | The IDs of users as approvers. If you provide both `user_ids` and `usernames`, it adds both lists of users. |
| `usernames` | string array | No | The usernames of approvers for this rule (same as `user_ids` but requires a list of usernames). If you provide both `user_ids` and `usernames`, it adds both lists of users. | | `usernames` | string array | No | The usernames of approvers for this rule (same as `user_ids` but requires a list of usernames). If you provide both `user_ids` and `usernames`, it adds both lists of users. |
......
...@@ -10,7 +10,7 @@ DETAILS: ...@@ -10,7 +10,7 @@ DETAILS:
**Tier:** Ultimate **Tier:** Ultimate
**Offering:** GitLab.com, Self-managed, GitLab Dedicated **Offering:** GitLab.com, Self-managed, GitLab Dedicated
This tutorial shows you how to create and configure a [merge request approval policy](../../user/application_security/policies/scan-result-policies.md). These policies can be set to take action based on scan results. This tutorial shows you how to create and configure a [merge request approval policy](../../user/application_security/policies/merge_request_approval_policies.md). These policies can be set to take action based on scan results.
For example, in this tutorial, you'll set up a policy that requires approval from two specified users if a vulnerability is detected in a merge request. For example, in this tutorial, you'll set up a policy that requires approval from two specified users if a vulnerability is detected in a merge request.
To set up a merge request approval policy: To set up a merge request approval policy:
......
...@@ -377,7 +377,7 @@ For more details, see [extension page](https://marketplace.visualstudio.com/item ...@@ -377,7 +377,7 @@ For more details, see [extension page](https://marketplace.visualstudio.com/item
You can enforce an additional approval for merge requests that would introduce one of the following You can enforce an additional approval for merge requests that would introduce one of the following
security issues: security issues:
- A security vulnerability. For more details, read [Merge request approval policies](policies/scan-result-policies.md). - A security vulnerability. For more details, read [Merge request approval policies](policies/merge_request_approval_policies.md).
## Using private Maven repositories ## Using private Maven repositories
......
...@@ -29,7 +29,7 @@ The following policy types are available: ...@@ -29,7 +29,7 @@ The following policy types are available:
- [Scan execution policy](scan_execution_policies.md). Enforce security scans, either as part of the - [Scan execution policy](scan_execution_policies.md). Enforce security scans, either as part of the
pipeline or on a specified schedule. pipeline or on a specified schedule.
- [Merge request approval policy](scan-result-policies.md). Enforce project-level settings and - [Merge request approval policy](merge_request_approval_policies.md). Enforce project-level settings and
approval rules based on scan results. approval rules based on scan results.
- [Pipeline execution policy](pipeline_execution_policies.md). Enforce CI/CD jobs as part of project pipelines. - [Pipeline execution policy](pipeline_execution_policies.md). Enforce CI/CD jobs as part of project pipelines.
...@@ -357,7 +357,7 @@ The workaround is to amend your group or instance push rules to allow branches f ...@@ -357,7 +357,7 @@ The workaround is to amend your group or instance push rules to allow branches f
subgroup the development project belongs to. Linking this way results in approval subgroup the development project belongs to. Linking this way results in approval
rules from the merge request approval policies not being applied to merge requests in the development project. rules from the merge request approval policies not being applied to merge requests in the development project.
- When creating a merge request approval policy, neither the array `severity_levels` nor the array - When creating a merge request approval policy, neither the array `severity_levels` nor the array
`vulnerability_states` in the [`scan_finding` rule](../policies/scan-result-policies.md#scan_finding-rule-type) `vulnerability_states` in the [`scan_finding` rule](../policies/merge_request_approval_policies.md#scan_finding-rule-type)
can be left empty. For a working rule, at least one entry must exist. can be left empty. For a working rule, at least one entry must exist.
- When merge request approval policies are enforced on projects containing manual jobs in their - When merge request approval policies are enforced on projects containing manual jobs in their
pipeline, policies evaluate the completed pipeline jobs and ignore the manual jobs. When the pipeline, policies evaluate the completed pipeline jobs and ignore the manual jobs. When the
......
This diff is collapsed.
...@@ -48,7 +48,7 @@ To create a license approval policy: ...@@ -48,7 +48,7 @@ To create a license approval policy:
1. [Link a security policy project](../application_security/policies/index.md#policy-implementation) to your development group, subgroup, or project (the Owner role is required). 1. [Link a security policy project](../application_security/policies/index.md#policy-implementation) to your development group, subgroup, or project (the Owner role is required).
1. On the left sidebar, select **Search or go to** and find your project. 1. On the left sidebar, select **Search or go to** and find your project.
1. Select **Secure > Policies**. 1. Select **Secure > Policies**.
1. Create a new [Scan Result Policy](../application_security/policies/scan-result-policies.md). 1. Create a new [Scan Result Policy](../application_security/policies/merge_request_approval_policies.md).
1. In your policy rule, select **License scanning**. 1. In your policy rule, select **License scanning**.
## Criteria defining which licenses require approval ## Criteria defining which licenses require approval
......
...@@ -171,7 +171,7 @@ When an approval rule is impossible to satisfy, GitLab shows the rule as ...@@ -171,7 +171,7 @@ When an approval rule is impossible to satisfy, GitLab shows the rule as
- The number of required approvals is greater than the number of eligible approvers. - The number of required approvals is greater than the number of eligible approvers.
These rules are automatically approved to unblock their respective merge requests, unless you These rules are automatically approved to unblock their respective merge requests, unless you
created them through a [merge request approval policy](../../../application_security/policies/scan-result-policies.md). created them through a [merge request approval policy](../../../application_security/policies/merge_request_approval_policies.md).
Invalid approval rules created through a merge request approval policy are: Invalid approval rules created through a merge request approval policy are:
- Shown with **Action required**. - Shown with **Action required**.
......
...@@ -33,7 +33,7 @@ enforce a [minimum number of required approvers](settings.md) in the project's s ...@@ -33,7 +33,7 @@ enforce a [minimum number of required approvers](settings.md) in the project's s
Merge requests that target a different project, such as from a fork to the upstream project, Merge requests that target a different project, such as from a fork to the upstream project,
use the default approval rules from the target (upstream) project, not the source (fork). use the default approval rules from the target (upstream) project, not the source (fork).
Merge request approvals can be configured globally to apply across all (or a subset) projects with [policies](../../../application_security/policies/index.md). [Merge request approval policies](../../../application_security/policies/scan-result-policies.md) also provide additional flexibility with more granular configuration options. Merge request approvals can be configured globally to apply across all (or a subset) projects with [policies](../../../application_security/policies/index.md). [Merge request approval policies](../../../application_security/policies/merge_request_approval_policies.md) also provide additional flexibility with more granular configuration options.
## Add an approval rule ## Add an approval rule
...@@ -291,7 +291,7 @@ DETAILS: ...@@ -291,7 +291,7 @@ DETAILS:
> - Bot comment for approvals [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/411656) in GitLab 16.2 [with a flag](../../../../administration/feature_flags.md) named `security_policy_approval_notification`. Enabled by default. > - Bot comment for approvals [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/411656) in GitLab 16.2 [with a flag](../../../../administration/feature_flags.md) named `security_policy_approval_notification`. Enabled by default.
> - Bot comment for approvals [generally available](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/130827) in GitLab 16.3. Feature flag `security_policy_approval_notification` removed. > - Bot comment for approvals [generally available](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/130827) in GitLab 16.3. Feature flag `security_policy_approval_notification` removed.
You can use [merge request approval policies](../../../application_security/policies/scan-result-policies.md#merge-request-approval-policy-editor) to define security approvals based on the status of vulnerabilities in the merge request and the default branch. You can use [merge request approval policies](../../../application_security/policies/merge_request_approval_policies.md#merge-request-approval-policy-editor) to define security approvals based on the status of vulnerabilities in the merge request and the default branch.
Details for each security policy is shown in the Security Approvals section of your Merge Request configuration. Details for each security policy is shown in the Security Approvals section of your Merge Request configuration.
The security approval rules are applied to all merge requests until the pipeline is complete. The application of the The security approval rules are applied to all merge requests until the pipeline is complete. The application of the
......
...@@ -49,7 +49,7 @@ When a branch is protected, the default behavior enforces these restrictions on ...@@ -49,7 +49,7 @@ When a branch is protected, the default behavior enforces these restrictions on
for that branch at the project level are ignored. All other protections continue for that branch at the project level are ignored. All other protections continue
to use project level settings. to use project level settings.
You can implement a [merge request approval policy](../application_security/policies/scan-result-policies.md#approval_settings) You can implement a [merge request approval policy](../application_security/policies/merge_request_approval_policies.md#approval_settings)
to prevent protected branches being unprotected or deleted. to prevent protected branches being unprotected or deleted.
### When a branch matches multiple rules ### When a branch matches multiple rules
......
...@@ -5,14 +5,20 @@ import LocalStorageSync from '~/vue_shared/components/local_storage_sync.vue'; ...@@ -5,14 +5,20 @@ import LocalStorageSync from '~/vue_shared/components/local_storage_sync.vue';
import { s__ } from '~/locale'; import { s__ } from '~/locale';
export default { export default {
MATCH_ON_INCLUSION_PATH: helpPagePath('user/application_security/policies/scan-result-policies', { MATCH_ON_INCLUSION_PATH: helpPagePath(
anchor: 'license_finding-rule-type', 'user/application_security/policies/merge_request_approval_policies',
}), {
SCAN_FINDING_TYPE_PATH: helpPagePath('user/application_security/policies/scan-result-policies', { anchor: 'license_finding-rule-type',
anchor: 'scan_finding-rule-type', },
}), ),
SCAN_FINDING_TYPE_PATH: helpPagePath(
'user/application_security/policies/merge_request_approval_policies',
{
anchor: 'scan_finding-rule-type',
},
),
MERGE_REQUEST_APPROVAL_PATH: helpPagePath( MERGE_REQUEST_APPROVAL_PATH: helpPagePath(
'user/application_security/policies/scan-result-policies', 'user/application_security/policies/merge_request_approval_policies',
{ {
anchor: 'merge-request-approval-policies-schema', anchor: 'merge-request-approval-policies-schema',
}, },
......
...@@ -53,8 +53,8 @@ export const BREAKING_CHANGES_POPOVER_CONTENTS = { ...@@ -53,8 +53,8 @@ export const BREAKING_CHANGES_POPOVER_CONTENTS = {
content: s__( content: s__(
'SecurityOrchestration|You must edit the policy and replace the deprecated syntax (%{deprecatedProperties}). For details on its replacement, see the %{linkStart}policy documentation%{linkEnd}.', 'SecurityOrchestration|You must edit the policy and replace the deprecated syntax (%{deprecatedProperties}). For details on its replacement, see the %{linkStart}policy documentation%{linkEnd}.',
), ),
link: helpPagePath('user/application_security/policies/scan-result-policies', { link: helpPagePath('user/application_security/policies/merge_request_approval_policies', {
anchor: 'merge-request-approval-policy-schema', anchor: 'merge-request-approval-policies-schema',
}), }),
}, },
[POLICY_TYPE_FILTER_OPTIONS.SCAN_EXECUTION.text]: { [POLICY_TYPE_FILTER_OPTIONS.SCAN_EXECUTION.text]: {
......
...@@ -5,9 +5,12 @@ import { s__ } from '~/locale'; ...@@ -5,9 +5,12 @@ import { s__ } from '~/locale';
import SectionLayout from '../../section_layout.vue'; import SectionLayout from '../../section_layout.vue';
export default { export default {
documentationLink: helpPagePath('user/application_security/policies/scan-result-policies', { documentationLink: helpPagePath(
anchor: 'example-bot-messages', 'user/application_security/policies/merge_request_approval_policies',
}), {
anchor: 'example-bot-messages',
},
),
i18n: { i18n: {
contentText: s__( contentText: s__(
'SecurityOrchestration|%{boldStart}Send a bot message%{boldEnd} as comment to merge request creator.', 'SecurityOrchestration|%{boldStart}Send a bot message%{boldEnd} as comment to merge request creator.',
......
...@@ -3,7 +3,7 @@ import { shallowMountExtended } from 'helpers/vue_test_utils_helper'; ...@@ -3,7 +3,7 @@ import { shallowMountExtended } from 'helpers/vue_test_utils_helper';
import BreakingChangesBanner from 'ee/security_orchestration/components/policies/banners/breaking_changes_banner.vue'; import BreakingChangesBanner from 'ee/security_orchestration/components/policies/banners/breaking_changes_banner.vue';
import LocalStorageSync from '~/vue_shared/components/local_storage_sync.vue'; import LocalStorageSync from '~/vue_shared/components/local_storage_sync.vue';
const HELP_PATH = '/help/user/application_security/policies/scan-result-policies#'; const HELP_PATH = '/help/user/application_security/policies/merge_request_approval_policies#';
describe('BreakingChangesBanner', () => { describe('BreakingChangesBanner', () => {
let wrapper; let wrapper;
......
...@@ -271,7 +271,7 @@ describe('List component', () => { ...@@ -271,7 +271,7 @@ describe('List component', () => {
}); });
expectRenderedBreakingChangesIcon( expectRenderedBreakingChangesIcon(
'You must edit the policy and replace the deprecated syntax (test, test1). For details on its replacement, see the policy documentation.', 'You must edit the policy and replace the deprecated syntax (test, test1). For details on its replacement, see the policy documentation.',
'/help/user/application_security/policies/scan-result-policies#merge-request-approval-policy-schema', '/help/user/application_security/policies/merge_request_approval_policies#merge-request-approval-policies-schema',
); );
}); });
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment