summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2023-01-12 18:08:22 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2023-01-12 18:08:22 +0000
commit93d7ee54f1920f37149d934c3420e8403463109a (patch)
treefda87dc589eecd8bedcd15c0bd20f11446b1d2cc /config
parentd549d413bb69f87ec26661ec96287bb4b25c32ff (diff)
downloadgitlab-ce-93d7ee54f1920f37149d934c3420e8403463109a.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
-rw-r--r--config/feature_categories.yml2
-rw-r--r--config/feature_flags/development/jira_connect_oauth_self_managed.yml2
-rw-r--r--config/feature_flags/development/new_fonts.yml2
3 files changed, 2 insertions, 4 deletions
diff --git a/config/feature_categories.yml b/config/feature_categories.yml
index 11be4eb2e70..4282fa32a1b 100644
--- a/config/feature_categories.yml
+++ b/config/feature_categories.yml
@@ -21,7 +21,6 @@
- billing_and_payments
- build
- build_artifacts
-- chatops
- cloud_native_installation
- cluster_cost_management
- code_quality
@@ -35,7 +34,6 @@
- container_scanning
- continuous_delivery
- continuous_integration
-- continuous_integration_scaling
- continuous_verification
- credential_management
- customersdot_application
diff --git a/config/feature_flags/development/jira_connect_oauth_self_managed.yml b/config/feature_flags/development/jira_connect_oauth_self_managed.yml
index dd7a8b6cd29..02c4b9fa398 100644
--- a/config/feature_flags/development/jira_connect_oauth_self_managed.yml
+++ b/config/feature_flags/development/jira_connect_oauth_self_managed.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/359940
milestone: '15.0'
type: development
group: group::integrations
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/new_fonts.yml b/config/feature_flags/development/new_fonts.yml
index 20bf283e704..43d22a34bc7 100644
--- a/config/feature_flags/development/new_fonts.yml
+++ b/config/feature_flags/development/new_fonts.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/379147
milestone: '15.7'
type: development
group: group::foundations
-default_enabled: false
+default_enabled: true