Merge branch 'ajk-declarative-policy-1.1.0' into 'master'

Update declarative_policy to v1.1.0

See merge request gitlab-org/gitlab!73831

Gemfile

@@ -24,7 +24,7 @@ gem 'faraday', '~> 1.0'
 gem 'marginalia', '~> 1.10.0'
 
 # Authorization
-gem 'declarative_policy', '~> 1.0.0'
+gem 'declarative_policy', '~> 1.1.0'
 
 # Authentication libraries
 gem 'devise', '~> 4.7.2'

Gemfile.lock

@@ -244,7 +244,7 @@ GEM
       html-pipeline
     declarative (0.0.20)
     declarative-option (0.1.0)
-    declarative_policy (1.0.0)
+    declarative_policy (1.1.0)
     default_value_for (3.4.0)
       activerecord (>= 3.2.0, < 7.0)
     deprecation_toolkit (1.5.1)
@@ -1421,7 +1421,7 @@ DEPENDENCIES
   crystalball (~> 0.7.0)
   database_cleaner (~> 1.7.0)
   deckar01-task_list (= 2.3.1)
-  declarative_policy (~> 1.0.0)
+  declarative_policy (~> 1.1.0)
   default_value_for (~> 3.4.0)
   deprecation_toolkit (~> 1.5.1)
   derailed_benchmarks

spec/models/ability_spec.rb

@@ -425,9 +425,9 @@ RSpec.describe Ability do
       expect(keys).to include(
         :administrator,
         'admin',
-        "/dp/condition/BasePolicy/admin/#{user_b.id}"
+        "/dp/condition/BasePolicy/admin/User:#{user_b.id}"
       )
-      expect(keys).not_to include("/dp/condition/BasePolicy/admin/#{user_a.id}")
+      expect(keys).not_to include("/dp/condition/BasePolicy/admin/User:#{user_a.id}")
     end
 
     # regression spec for re-entrant admin condition checks