summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-09-18 15:09:22 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-09-18 15:09:22 +0000
commit80d252c8e25dc88023e750cf2a22be6186cfd6aa (patch)
treead932c5973af9081cbafb0dcbbd24a3a100105a6 /config
parentdc86d5615e92ad4dfad4e5b452e8623a552b308b (diff)
downloadgitlab-ce-80d252c8e25dc88023e750cf2a22be6186cfd6aa.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
-rw-r--r--config/feature_flags/development/group_level_integrations.yml2
-rw-r--r--config/feature_flags/ops/database_reindexing.yml7
2 files changed, 8 insertions, 1 deletions
diff --git a/config/feature_flags/development/group_level_integrations.yml b/config/feature_flags/development/group_level_integrations.yml
index 8fc7da47ba1..c089333f72a 100644
--- a/config/feature_flags/development/group_level_integrations.yml
+++ b/config/feature_flags/development/group_level_integrations.yml
@@ -1,6 +1,6 @@
---
name: group_level_integrations
-introduced_by_url:
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/27557
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/238575
group: group::ecosystem
type: development
diff --git a/config/feature_flags/ops/database_reindexing.yml b/config/feature_flags/ops/database_reindexing.yml
new file mode 100644
index 00000000000..ea000a052db
--- /dev/null
+++ b/config/feature_flags/ops/database_reindexing.yml
@@ -0,0 +1,7 @@
+---
+name: database_reindexing
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/42705
+rollout_issue_url:
+group: group::database
+type: ops
+default_enabled: false \ No newline at end of file