summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-04-02 09:08:14 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-04-02 09:08:14 +0000
commitade18c9d68d5a2e6c6e28ef7e9d3add3b3491ace (patch)
treecf4154332fc95283f58cccb1383e43b40485d91d /config
parentba836d98593d68d8d6c22c540e31c8031a786bd8 (diff)
downloadgitlab-ce-ade18c9d68d5a2e6c6e28ef7e9d3add3b3491ace.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
-rw-r--r--config/feature_categories.yml1
1 files changed, 0 insertions, 1 deletions
diff --git a/config/feature_categories.yml b/config/feature_categories.yml
index b40bbdd9658..f12c0ef466a 100644
--- a/config/feature_categories.yml
+++ b/config/feature_categories.yml
@@ -71,7 +71,6 @@
- kubernetes_management
- language_specific
- license_compliance
-- live_coding
- load_testing
- logging
- malware_scanning