Merge branch '220409-admins-cannot-access-projects-with-ip-restriction' into 'master'

Resolve Admins cannot access projects with IP restriction

See merge request gitlab-org/gitlab!34086

ee/app/policies/ee/project_policy.rb

@@ -368,7 +368,7 @@ module EE
         prevent :owner_access
       end
 
-      rule { ip_enforcement_prevents_access }.policy do
+      rule { ip_enforcement_prevents_access & ~admin }.policy do
         prevent :read_project
       end
 

ee/changelogs/unreleased/220409-admins-cannot-access-projects-with-ip-restriction.yml

+---
+title: Allow admins to see project despite of ip restriction set on a group level
+merge_request: 34086
+author:
+type: fixed

ee/spec/policies/project_policy_spec.rb

@@ -427,6 +427,14 @@ RSpec.describe ProjectPolicy do
           let(:range) { '10.0.0.0/8' }
 
           it { is_expected.to be_disallowed(:read_project) }
+
+          context 'with admin enabled', :enable_admin_mode do
+            it { is_expected.to be_allowed(:read_project) }
+          end
+
+          context 'with admin disabled' do
+            it { is_expected.to be_disallowed(:read_project) }
+          end
         end
       end