diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-06-07 03:10:26 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-06-07 03:10:26 +0300 |
| commit | 1e19d757e8a088e9d4aa67cc092fda87aba1cd35 (patch) | |
| tree | b183775b7355dae057ab0d2e5076df86cdc8a77d /config | |
| parent | b04f912deb494b6dc0d0dba36776a5e53f622b43 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
| -rw-r--r-- | config/feature_flags/worker/defer_sidekiq_workers_on_database_health_signal.yml | 8 | ||||
| -rw-r--r-- | config/gitleaks.toml | 3 |
2 files changed, 3 insertions, 8 deletions
diff --git a/config/feature_flags/worker/defer_sidekiq_workers_on_database_health_signal.yml b/config/feature_flags/worker/defer_sidekiq_workers_on_database_health_signal.yml deleted file mode 100644 index 7e8575074c0..00000000000 --- a/config/feature_flags/worker/defer_sidekiq_workers_on_database_health_signal.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: defer_sidekiq_workers_on_database_health_signal -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/121261 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/412990 -milestone: '16.1' -type: worker -group: group::database -default_enabled: false diff --git a/config/gitleaks.toml b/config/gitleaks.toml index be02a43aa9c..24761dfd783 100644 --- a/config/gitleaks.toml +++ b/config/gitleaks.toml @@ -18,4 +18,7 @@ path = "/gitleaks.toml" "glpat--8GMtG8Mf4EnMJzmAWDU", # doc/development/sec/token_revocation_api.md "glpat--tG84EGK33nMLLDE70zU", + # doc/ci/runners/new_creation_workflow.md + "GR1348941C6YcZVddc8kjtdU-yWYD", + "glrt-2CR8_eVxiioB1QmzPZwa", ] |