Add latest changes from gitlab-org/gitlab@master

1 files changed, 4 insertions, 2 deletions

diff --git a/lib/gitlab/application_context.rb b/lib/gitlab/application_context.rb
index b950bfb0f3a..60a50e97998 100644
--- a/lib/gitlab/application_context.rb
+++ b/lib/gitlab/application_context.rb
@@ -5,13 +5,14 @@ module Gitlab
   class ApplicationContext
     include Gitlab::Utils::LazyAttributes
 
-    Attribute = Struct.new(:name, :type, :evaluation)
+    Attribute = Struct.new(:name, :type)
 
     APPLICATION_ATTRIBUTES = [
       Attribute.new(:project, Project),
       Attribute.new(:namespace, Namespace),
       Attribute.new(:user, User),
-      Attribute.new(:caller_id, String)
+      Attribute.new(:caller_id, String),
+      Attribute.new(:related_class, String)
     ].freeze
 
     def self.with_context(args, &block)
@@ -39,6 +40,7 @@ module Gitlab
         hash[:project] = -> { project_path } if set_values.include?(:project)
         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)
       end
     end