diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-01-21 18:08:36 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-01-21 18:08:36 +0300 |
| commit | 81884c35b86035f89364db482e4fff91718bb63a (patch) | |
| tree | 49090a57dd0e6e49390f593bf24ee49dd8fb7b7f /config | |
| parent | 6f3692902c2e5dc690593b8c44f77b86b5c28904 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
| -rw-r--r-- | config/feature_categories.yml | 3 | ||||
| -rw-r--r-- | config/routes.rb | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/config/feature_categories.yml b/config/feature_categories.yml index 805cc3b50a3..5c7ae175d1d 100644 --- a/config/feature_categories.yml +++ b/config/feature_categories.yml @@ -66,6 +66,7 @@ - jenkins_importer - jira_importer - kubernetes_management +- license - license_compliance - live_preview - load_testing @@ -84,7 +85,6 @@ - privacy_control_center - product_analytics - projects -- provision - purchase - quality_management - release_evidence @@ -113,6 +113,7 @@ - usability_testing - usage_ping - users +- utilization - value_stream_management - vulnerability_database - vulnerability_management diff --git a/config/routes.rb b/config/routes.rb index 91d1a817175..2f7e781d22c 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -158,6 +158,7 @@ Rails.application.routes.draw do get :db_spin get :sleep get :kill + post :gc end end |