diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-20 15:08:50 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-20 15:08:50 +0300 |
| commit | 81fb153d0550c2c0b707a374cb6ee9f2ad089790 (patch) | |
| tree | 0326c005bea62adc258bb0d4d1a3a7f5fc6a9532 /config | |
| parent | 084d7453e0866f2b29923552fb1c5f380f283ab5 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
| -rw-r--r-- | config/feature_flags/development/ci_enforce_throttle_pipelines_creation.yml (renamed from config/feature_flags/development/ci_throttle_pipelines_creation.yml) | 8 | ||||
| -rw-r--r-- | config/feature_flags/development/deployment_hooks_skip_worker.yml (renamed from config/feature_flags/development/ci_throttle_pipelines_creation_dry_run.yml) | 10 |
2 files changed, 9 insertions, 9 deletions
diff --git a/config/feature_flags/development/ci_throttle_pipelines_creation.yml b/config/feature_flags/development/ci_enforce_throttle_pipelines_creation.yml index 162a69ade5d..828fde06bab 100644 --- a/config/feature_flags/development/ci_throttle_pipelines_creation.yml +++ b/config/feature_flags/development/ci_enforce_throttle_pipelines_creation.yml @@ -1,8 +1,8 @@ --- -name: ci_throttle_pipelines_creation -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/83969 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/357520 -milestone: '14.10' +name: ci_enforce_throttle_pipelines_creation +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/87223 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/362513 +milestone: '15.1' type: development group: group::pipeline execution default_enabled: false diff --git a/config/feature_flags/development/ci_throttle_pipelines_creation_dry_run.yml b/config/feature_flags/development/deployment_hooks_skip_worker.yml index 5092767e089..d7d35912e2d 100644 --- a/config/feature_flags/development/ci_throttle_pipelines_creation_dry_run.yml +++ b/config/feature_flags/development/deployment_hooks_skip_worker.yml @@ -1,8 +1,8 @@ --- -name: ci_throttle_pipelines_creation_dry_run -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/83969 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/357524 +name: deployment_hooks_skip_worker +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/83351 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/356468 milestone: '14.10' type: development -group: group::pipeline execution -default_enabled: true +group: group::integrations +default_enabled: false |