Add latest changes from gitlab-org/gitlab@master
This commit is contained in:
parent
f59af605a0
commit
a8a78f4a02
|
|
@ -640,12 +640,15 @@ To disable variable expansion for the variable:
|
|||
|
||||
## CI/CD variable precedence
|
||||
|
||||
> Scan Execution Policies variable precedence was [changed](https://gitlab.com/gitlab-org/gitlab/-/issues/424028) in GitLab 16.6 [with a flag](../../administration/feature_flags.md) named `security_policies_variables_precedence`. Disabled by default.
|
||||
|
||||
You can use CI/CD variables with the same name in different places, but the values
|
||||
can overwrite each other. The type of variable and where they are defined determines
|
||||
which variables take precedence.
|
||||
|
||||
The order of precedence for variables is (from highest to lowest):
|
||||
|
||||
1. [Scan Execution Policies variables](../../user/application_security/policies/scan-execution-policies.md).
|
||||
1. These variables all have the same (highest) precedence:
|
||||
- [Trigger variables](../triggers/index.md#pass-cicd-variables-in-the-api-call).
|
||||
- [Scheduled pipeline variables](../pipelines/schedules.md#add-a-pipeline-schedule).
|
||||
|
|
|
|||
|
|
@ -201,6 +201,8 @@ The keys for a schedule rule are:
|
|||
|
||||
## `scan` action type
|
||||
|
||||
> Scan Execution Policies variable precedence was [changed](https://gitlab.com/gitlab-org/gitlab/-/issues/424028) in GitLab 16.6 [with a flag](../../../administration/feature_flags.md) named `security_policies_variables_precedence`. Disabled by default.
|
||||
|
||||
This action executes the selected `scan` with additional parameters when conditions for at least one
|
||||
rule in the defined policy are met.
|
||||
|
||||
|
|
|
|||
|
|
@ -202,3 +202,5 @@ module Gitlab
|
|||
end
|
||||
end
|
||||
end
|
||||
|
||||
Gitlab::Ci::Variables::Builder.prepend_mod_with('Gitlab::Ci::Variables::Builder')
|
||||
|
|
|
|||
Loading…
Reference in New Issue