don't double-cache project_abilites

1 files changed, 2 insertions, 11 deletions

diff --git a/app/models/ability.rb b/app/models/ability.rb
index e8ce9e7d4c8..0bf7560da61 100644
--- a/app/models/ability.rb
+++ b/app/models/ability.rb
@@ -181,17 +181,8 @@ class Ability
     end
 
     def project_abilities(user, project)
-      key = "/user/#{user.id}/project/#{project.id}"
-
-      if RequestStore.active?
-        RequestStore.store[key] ||= uncached_project_abilities(user, project)
-      else
-        uncached_project_abilities(user, project)
-      end
-    end
-
-    def uncached_project_abilities(user, project)
       rules = []
+
       # Push abilities on the users team role
       rules.push(*project_team_rules(project.team, user))
 
@@ -218,7 +209,7 @@ class Ability
         rules -= project_archived_rules
       end
 
-      (rules - project_disabled_features_rules(project)).uniq
+      rules - project_disabled_features_rules(project)
     end
 
     def project_team_rules(team, user)