diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-25 18:10:33 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-25 18:10:33 +0300 |
| commit | a8c1bc6f757ecacbc3481e52a3f4cefb6c6db5fd (patch) | |
| tree | 7ba85d57835274f11674c33155e68b6af33f2687 /config | |
| parent | 76ef00aac974a463243dcda6f692b17ff5d439bc (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
| -rw-r--r-- | config/feature_flags/development/security_ci_lint_authorization.yml | 8 | ||||
| -rw-r--r-- | config/sidekiq_queues.yml | 2 |
2 files changed, 8 insertions, 2 deletions
diff --git a/config/feature_flags/development/security_ci_lint_authorization.yml b/config/feature_flags/development/security_ci_lint_authorization.yml new file mode 100644 index 00000000000..73b3bd45727 --- /dev/null +++ b/config/feature_flags/development/security_ci_lint_authorization.yml @@ -0,0 +1,8 @@ +--- +name: security_ci_lint_authorization +introduced_by_url: https://gitlab.com/gitlab-org/security/gitlab/-/merge_requests/1279 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/326708 +milestone: '14.0' +type: development +group: group::pipeline authoring +default_enabled: false diff --git a/config/sidekiq_queues.yml b/config/sidekiq_queues.yml index 78c073b354f..24d140abada 100644 --- a/config/sidekiq_queues.yml +++ b/config/sidekiq_queues.yml @@ -45,8 +45,6 @@ - - authorized_project_update - 1 - - authorized_projects - - 1 -- - authorized_projects - 2 - - auto_devops - 2 |