From aefe6486cf0d193067112b90145083d73b96bfef Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Fri, 4 Dec 2020 16:51:40 +0000 Subject: Add latest changes from gitlab-org/security/gitlab@13-6-stable-ee --- config/application.rb | 1 + 1 file changed, 1 insertion(+) (limited to 'config') 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 -- cgit v1.2.1 From 4e3a54f835daa49bf784d6e6ad91e90116a24dc8 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Fri, 4 Dec 2020 16:53:44 +0000 Subject: Add latest changes from gitlab-org/security/gitlab@13-6-stable-ee --- config/feature_categories.yml | 1 + 1 file changed, 1 insertion(+) (limited to 'config') 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 -- cgit v1.2.1