Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-12-08 15:09:53 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2020-12-08 15:09:53 +0300
commit148b75b329294f6b6ae409bbf8d70590e63c6bc9 (patch)
tree30918a97e353067ff9c99e04fb7e296305d130b7 /config
parent707742e59ca57d1f2ea00d65fa35a7b9a5ded398 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
-rw-r--r--config/feature_flags/development/ci_cross_pipeline_artifacts_download.yml8
-rw-r--r--config/feature_flags/development/saas_add_seats_button.yml (renamed from config/feature_flags/development/cd_auto_rollback.yml)10
2 files changed, 13 insertions, 5 deletions
diff --git a/config/feature_flags/development/ci_cross_pipeline_artifacts_download.yml b/config/feature_flags/development/ci_cross_pipeline_artifacts_download.yml
new file mode 100644
index 00000000000..83fe049db8e
--- /dev/null
+++ b/config/feature_flags/development/ci_cross_pipeline_artifacts_download.yml
@@ -0,0 +1,8 @@
+---
+name: ci_cross_pipeline_artifacts_download
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/48342
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/287622
+milestone: '13.7'
+type: development
+group: group::continuous integration
+default_enabled: false
diff --git a/config/feature_flags/development/cd_auto_rollback.yml b/config/feature_flags/development/saas_add_seats_button.yml
index 0878fac7d26..1817481439a 100644
--- a/config/feature_flags/development/cd_auto_rollback.yml
+++ b/config/feature_flags/development/saas_add_seats_button.yml
@@ -1,8 +1,8 @@
---
-name: cd_auto_rollback
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/45816
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/35404
-milestone: '13.6'
+name: saas_add_seats_button
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/49242
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/291060
+milestone: '13.7'
type: development
-group: group::progressive delivery
+group: group::purchase
default_enabled: false