add automatic detection of the policy class

1 files changed, 3 insertions, 15 deletions

diff --git a/app/models/ability.rb b/app/models/ability.rb
index c89cc9b2e17..ac5e82c14d2 100644
--- a/app/models/ability.rb
+++ b/app/models/ability.rb
@@ -61,6 +61,9 @@ class Ability
     private
 
     def uncached_allowed(user, subject)
+      policy_class = BasePolicy.class_for(subject) rescue nil
+      return policy_class.abilities(user, subject) if policy_class
+
       return anonymous_abilities(subject) if user.nil?
       return [] unless user.is_a?(User)
       return [] if user.blocked?
@@ -70,13 +73,6 @@ class Ability
 
     def abilities_by_subject_class(user:, subject:)
       case subject
-      when Project then ProjectPolicy.abilities(user, subject)
-      when Issue then IssuePolicy.abilities(user, subject)
-      when MergeRequest then MergeRequestPolicy.abilities(user, subject)
-
-      when Ci::Build then Ci::BuildPolicy.abilities(user, subject)
-      when CommitStatus then CommitStatus.abilities(user, subject)
-      when Note then note_abilities(user, subject)
       when ProjectSnippet then project_snippet_abilities(user, subject)
       when PersonalSnippet then personal_snippet_abilities(user, subject)
       when Group then group_abilities(user, subject)
@@ -96,14 +92,6 @@ class Ability
         anonymous_personal_snippet_abilities(subject)
       elsif subject.is_a?(ProjectSnippet)
         anonymous_project_snippet_abilities(subject)
-      elsif subject.is_a?(CommitStatus)
-        anonymous_commit_status_abilities(subject)
-      elsif subject.is_a?(Project)
-        ProjectPolicy.abilities(nil, subject)
-      elsif subject.is_a?(Issue)
-        IssuePolicy.abilities(nil, subject)
-      elsif subject.is_a?(MergeRequest)
-        MergeRequestPolicy.abilities(nil, subject)
       elsif subject.respond_to?(:project)
         ProjectPolicy.abilities(nil, subject.project)
       elsif subject.is_a?(Group) || subject.respond_to?(:group)