diff options
| author | GitLab Release Tools Bot <delivery-team+release-tools@gitlab.com> | 2020-12-07 20:24:11 +0000 |
|---|---|---|
| committer | GitLab Release Tools Bot <delivery-team+release-tools@gitlab.com> | 2020-12-07 20:24:11 +0000 |
| commit | 1b517a5a19c4aafc6fa6d738b0ee7c1e4a2cce36 (patch) | |
| tree | 11bb99aa913b3a18342818e15a71856e214caee6 /config | |
| parent | 1b6a590b197788a06a1ff726ea61630a49b10412 (diff) | |
| parent | f508fb8a043a4b1f996cb7ec8bba198e5b5986f5 (diff) | |
| download | gitlab-ce-1b517a5a19c4aafc6fa6d738b0ee7c1e4a2cce36.tar.gz | |
Merge remote-tracking branch 'dev/13-6-stable' into 13-6-stable
Diffstat (limited to 'config')
| -rw-r--r-- | config/application.rb | 1 | ||||
| -rw-r--r-- | config/feature_categories.yml | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/config/application.rb b/config/application.rb index e8aebec086b..3981ba348ae 100644 --- a/config/application.rb +++ b/config/application.rb @@ -137,6 +137,7 @@ module Gitlab encrypted_key import_url elasticsearch_url + search otp_attempt sentry_dsn trace diff --git a/config/feature_categories.yml b/config/feature_categories.yml index fb261377532..205d3ee5851 100644 --- a/config/feature_categories.yml +++ b/config/feature_categories.yml @@ -45,6 +45,7 @@ - dynamic_application_security_testing - editor_extension - epics +- epic_tracking - error_tracking - feature_flags - foundations |