Add latest changes from gitlab-org/gitlab@13-5-stable-eev13.5.0-rc42

1 files changed, 3 insertions, 1 deletions

diff --git a/lib/gitlab/application_context.rb b/lib/gitlab/application_context.rb
index 30cb74bcf54..b4bbb309c36 100644
--- a/lib/gitlab/application_context.rb
+++ b/lib/gitlab/application_context.rb
@@ -12,7 +12,8 @@ module Gitlab
       Attribute.new(:namespace, Namespace),
       Attribute.new(:user, User),
       Attribute.new(:caller_id, String),
-      Attribute.new(:related_class, String)
+      Attribute.new(:related_class, String),
+      Attribute.new(:feature_category, String)
     ].freeze
 
     def self.with_context(args, &block)
@@ -45,6 +46,7 @@ module Gitlab
         hash[:root_namespace] = -> { root_namespace_path } if include_namespace?
         hash[:caller_id] = caller_id if set_values.include?(:caller_id)
         hash[:related_class] = related_class if set_values.include?(:related_class)
+        hash[:feature_category] = feature_category if set_values.include?(:feature_category)
       end
     end