Add latest changes from gitlab-org/gitlab@13-0-stable-ee

1 files changed, 8 insertions, 9 deletions

diff --git a/lib/declarative_policy.rb b/lib/declarative_policy.rb
index e51f30af581..bd1c121fe79 100644
--- a/lib/declarative_policy.rb
+++ b/lib/declarative_policy.rb
@@ -72,18 +72,17 @@ module DeclarativePolicy
     end
 
     def compute_class_for_class(subject_class)
+      if subject_class.respond_to?(:declarative_policy_class)
+        return subject_class.declarative_policy_class.constantize
+      end
+
       subject_class.ancestors.each do |klass|
-        next unless klass.name
+        name = klass.name
+
+        next unless name
 
         begin
-          klass_name =
-            if subject_class.respond_to?(:declarative_policy_class)
-              subject_class.declarative_policy_class
-            else
-              "#{klass.name}Policy"
-            end
-
-          policy_class = klass_name.constantize
+          policy_class = "#{name}Policy".constantize
 
           # NOTE: the < operator here tests whether policy_class
           # inherits from Base. We can't use #is_a? because that