diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-03 21:10:05 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-03 21:10:05 +0300 |
| commit | 0851c83c27613426f80d94fe74e9a7e8bc520fc0 (patch) | |
| tree | a89c7f9c9c03dfabac2954a4c20c51add0475427 /config | |
| parent | 31979cb3238a9993bd9834ff3cf4099f43257816 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
| -rw-r--r-- | config/feature_categories.yml | 2 | ||||
| -rw-r--r-- | config/initializers_before_autoloader/000_inflections.rb | 1 |
2 files changed, 0 insertions, 3 deletions
diff --git a/config/feature_categories.yml b/config/feature_categories.yml index fd4cc8bf2a5..e41d6d86e46 100644 --- a/config/feature_categories.yml +++ b/config/feature_categories.yml @@ -42,7 +42,6 @@ - design_management - design_system - devops_reports -- digital_experience_management - disaster_recovery - dynamic_application_security_testing - editor_extension @@ -72,7 +71,6 @@ - jupyter_notebooks - kanban_boards - kubernetes_management -- language_specific - license_compliance - live_preview - load_testing diff --git a/config/initializers_before_autoloader/000_inflections.rb b/config/initializers_before_autoloader/000_inflections.rb index 6e2206d8efc..5c1a3e87fba 100644 --- a/config/initializers_before_autoloader/000_inflections.rb +++ b/config/initializers_before_autoloader/000_inflections.rb @@ -26,7 +26,6 @@ ActiveSupport::Inflector.inflections do |inflect| project_statistics system_note_metadata vulnerabilities_feedback - vulnerability_export_registry vulnerability_feedback ) inflect.acronym 'EE' |