summaryrefslogtreecommitdiff
path: root/config/feature_flags
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-05-11 12:10:20 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2021-05-11 12:10:20 +0000
commitc33a9adb709ffb40f816e66eb0c98cc750d6cd43 (patch)
tree1a5b3e103d8d9677dc9a3271cd6093454c898bd8 /config/feature_flags
parent7fa274753de913596db0d3eff5c7a3896c6fdd0a (diff)
downloadgitlab-ce-c33a9adb709ffb40f816e66eb0c98cc750d6cd43.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config/feature_flags')
-rw-r--r--config/feature_flags/development/find_remote_root_refs_inmemory.yml2
-rw-r--r--config/feature_flags/development/user_group_counts.yml8
2 files changed, 1 insertions, 9 deletions
diff --git a/config/feature_flags/development/find_remote_root_refs_inmemory.yml b/config/feature_flags/development/find_remote_root_refs_inmemory.yml
index 18e2e2b366a..c78eadceaad 100644
--- a/config/feature_flags/development/find_remote_root_refs_inmemory.yml
+++ b/config/feature_flags/development/find_remote_root_refs_inmemory.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/329664
milestone: '13.12'
type: development
group: group::gitaly
-default_enabled: true
+default_enabled: false
diff --git a/config/feature_flags/development/user_group_counts.yml b/config/feature_flags/development/user_group_counts.yml
deleted file mode 100644
index 98798ea3ead..00000000000
--- a/config/feature_flags/development/user_group_counts.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: user_group_counts
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/44069/
-rollout_issue_url:
-milestone: '13.6'
-type: development
-group: group::compliance
-default_enabled: false