diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-21 10:08:36 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-21 10:08:36 +0300 |
commit | 48aff82709769b098321c738f3444b9bdaa694c6 (patch) | |
tree | e00c7c43e2d9b603a5a6af576b1685e400410dee /lib/gitlab/application_context.rb | |
parent | 879f5329ee916a948223f8f43d77fba4da6cd028 (diff) |
Add latest changes from gitlab-org/gitlab@13-5-stable-eev13.5.0-rc42
Diffstat (limited to 'lib/gitlab/application_context.rb')
-rw-r--r-- | lib/gitlab/application_context.rb | 4 |
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 |