summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-10-17 00:08:46 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-10-17 00:08:46 +0000
commit88141b43d5d048b9f6e550e37351c514cdcfdb3b (patch)
treeac06bf6454897dabcabccee01b5ab3ed5ba6d898 /config
parentfd11748fe8dcb109a1bd0650963383d843ea7bd5 (diff)
downloadgitlab-ce-88141b43d5d048b9f6e550e37351c514cdcfdb3b.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
-rw-r--r--config/feature_flags/development/ci_manual_bridges.yml2
-rw-r--r--config/feature_flags/development/two_factor_for_cli.yml7
2 files changed, 8 insertions, 1 deletions
diff --git a/config/feature_flags/development/ci_manual_bridges.yml b/config/feature_flags/development/ci_manual_bridges.yml
index f654839e37c..fa3f323722d 100644
--- a/config/feature_flags/development/ci_manual_bridges.yml
+++ b/config/feature_flags/development/ci_manual_bridges.yml
@@ -4,4 +4,4 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/44011
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/263412
type: development
group: group::pipeline authoring
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/two_factor_for_cli.yml b/config/feature_flags/development/two_factor_for_cli.yml
new file mode 100644
index 00000000000..f75264451e0
--- /dev/null
+++ b/config/feature_flags/development/two_factor_for_cli.yml
@@ -0,0 +1,7 @@
+---
+name: two_factor_for_cli
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/39703
+rollout_issue_url:
+type: development
+group: group::access
+default_enabled: false