summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2023-05-08 21:15:10 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2023-05-08 21:15:10 +0000
commit7db94a9807df03ce7a4f210b513816a47f34e15b (patch)
treea20574d4297ba13e3340bfae217e3035e77d6423 /config
parent3a563d7c1e15023f205d2a357e5d8a38a3b53ecc (diff)
downloadgitlab-ce-7db94a9807df03ce7a4f210b513816a47f34e15b.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
-rw-r--r--config/feature_flags/development/mirror_only_branches_match_regex.yml2
-rw-r--r--config/feature_flags/development/restrict_merge_status_recheck.yml2
2 files changed, 2 insertions, 2 deletions
diff --git a/config/feature_flags/development/mirror_only_branches_match_regex.yml b/config/feature_flags/development/mirror_only_branches_match_regex.yml
index 6494569b364..3311187e3b4 100644
--- a/config/feature_flags/development/mirror_only_branches_match_regex.yml
+++ b/config/feature_flags/development/mirror_only_branches_match_regex.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/381667
milestone: '15.6'
type: development
group: "group::source code"
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/restrict_merge_status_recheck.yml b/config/feature_flags/development/restrict_merge_status_recheck.yml
index 6be7ed73214..8b7da326773 100644
--- a/config/feature_flags/development/restrict_merge_status_recheck.yml
+++ b/config/feature_flags/development/restrict_merge_status_recheck.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/404567
milestone: '15.11'
type: development
group: group::code review
-default_enabled: false
+default_enabled: true