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

2 files changed, 2 insertions, 2 deletions

diff --git a/lib/declarative_policy/base.rb b/lib/declarative_policy/base.rb
index 4af0251b990..49cbdd2aeb4 100644
--- a/lib/declarative_policy/base.rb
+++ b/lib/declarative_policy/base.rb
@@ -213,7 +213,7 @@ module DeclarativePolicy
     #
     # It also stores a reference to the cache, so it can be used
     # to cache computations by e.g. ManifestCondition.
-    attr_reader :user, :subject, :cache
+    attr_reader :user, :subject
     def initialize(user, subject, opts = {})
       @user = user
       @subject = subject
diff --git a/lib/declarative_policy/runner.rb b/lib/declarative_policy/runner.rb
index 70666dc7924..59588b4d84e 100644
--- a/lib/declarative_policy/runner.rb
+++ b/lib/declarative_policy/runner.rb
@@ -170,7 +170,7 @@ module DeclarativePolicy
             lowest_score = score
           end
 
-          break if lowest_score.zero?
+          break if lowest_score == 0
         end
 
         [remaining_steps, remaining_enablers, remaining_preventers].each do |set|