Dry up project access logicmk/dry-up-access-logic

To ensure consistency.

1 files changed, 1 insertions, 14 deletions

diff --git a/app/policies/project_policy.rb b/app/policies/project_policy.rb
index e2634692dc7..1931006bed3 100644
--- a/app/policies/project_policy.rb
+++ b/app/policies/project_policy.rb
@@ -130,7 +130,7 @@ class ProjectPolicy < BasePolicy
   features.each do |f|
     # these are scored high because they are unlikely
     desc "Project has #{f} disabled"
-    condition(:"#{f}_disabled", score: 32) { !feature_available?(f.to_sym) }
+    condition(:"#{f}_disabled", score: 32) { !@subject.feature_available?(f.to_sym, @user) }
   end
 
   # `:read_project` may be prevented in EE, but `:read_project_for_iids` should
@@ -501,19 +501,6 @@ class ProjectPolicy < BasePolicy
     project.team.max_member_access(@user.id)
   end
 
-  def feature_available?(feature)
-    return false unless project.project_feature
-
-    case project.project_feature.access_level(feature)
-    when ProjectFeature::DISABLED
-      false
-    when ProjectFeature::PRIVATE
-      admin? || team_access_level >= ProjectFeature.required_minimum_access_level(feature)
-    else
-      true
-    end
-  end
-
   def project
     @subject
   end