diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-12-20 12:10:35 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-12-20 12:10:35 +0300 |
| commit | 0b7d3f810f287523fd4ad72c019d78e8d2983f8a (patch) | |
| tree | fdb52060e586a5548f026b6a3ce71c5b676d9e5c /config | |
| parent | 51da6793bcbe7295c1f3f881f756b8b60ee06da1 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
| -rw-r--r-- | config/feature_flags/development/prefix_scim_tokens.yml | 8 | ||||
| -rw-r--r-- | config/gitleaks.toml | 1 |
2 files changed, 9 insertions, 0 deletions
diff --git a/config/feature_flags/development/prefix_scim_tokens.yml b/config/feature_flags/development/prefix_scim_tokens.yml new file mode 100644 index 00000000000..297327f26d2 --- /dev/null +++ b/config/feature_flags/development/prefix_scim_tokens.yml @@ -0,0 +1,8 @@ +--- +name: prefix_scim_tokens +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/139737 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/435423 +milestone: '16.8' +type: development +group: group::authentication +default_enabled: false diff --git a/config/gitleaks.toml b/config/gitleaks.toml index a492b38fdf9..0983a34ca71 100644 --- a/config/gitleaks.toml +++ b/config/gitleaks.toml @@ -13,6 +13,7 @@ path = "/gitleaks.toml" # spec/frontend/lib/utils/secret_detection_spec.js "glpat-cgyKc1k_AsnEpmP-5fRL", "gldt-cgyKc1k_AsnEpmP-5fRL", + "glsoat-cgyKc1k_AsnEpmP-5fRL", # spec/frontend/lib/utils/secret_detection_spec.js "GlPat-abcdefghijklmnopqrstuvwxyz", # doc/development/sec/token_revocation_api.md |