diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-12-26 12:12:46 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-12-26 12:12:46 +0300 |
| commit | 844c80c9f7b85f730c83a05b2da360ba4203a007 (patch) | |
| tree | c160ad400c2b1b0089ce00f2e0e677f5fa167703 /config | |
| parent | 9e9ddb97773012d12cec8973b21576ecf72b4fbf (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
| -rw-r--r-- | config/feature_flags/beta/prefix_ci_build_tokens.yml | 9 | ||||
| -rw-r--r-- | config/gitleaks.toml | 2 |
2 files changed, 11 insertions, 0 deletions
diff --git a/config/feature_flags/beta/prefix_ci_build_tokens.yml b/config/feature_flags/beta/prefix_ci_build_tokens.yml new file mode 100644 index 00000000000..ed0838b36bd --- /dev/null +++ b/config/feature_flags/beta/prefix_ci_build_tokens.yml @@ -0,0 +1,9 @@ +--- +name: prefix_ci_build_tokens +feature_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/426137 +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/140159 +rollout_issue_url: https://gitlab.com/gitlab-com/gl-infra/production/-/issues/17299 +milestone: '16.8' +group: group::pipeline security +type: beta +default_enabled: false diff --git a/config/gitleaks.toml b/config/gitleaks.toml index 0983a34ca71..d0d140c8414 100644 --- a/config/gitleaks.toml +++ b/config/gitleaks.toml @@ -14,6 +14,8 @@ path = "/gitleaks.toml" "glpat-cgyKc1k_AsnEpmP-5fRL", "gldt-cgyKc1k_AsnEpmP-5fRL", "glsoat-cgyKc1k_AsnEpmP-5fRL", + "glcbt-FFFF_cgyKc1k_AsnEpmP-5fRL", + "glcbt-1_cgyKc1k_AsnEpmP-5fRL", # spec/frontend/lib/utils/secret_detection_spec.js "GlPat-abcdefghijklmnopqrstuvwxyz", # doc/development/sec/token_revocation_api.md |