From 6c22ebcc51758fbc9e2b02df0525a8897f849b6b Mon Sep 17 00:00:00 2001
From: Devin Howard <devin@callysto.com>
Date: Tue, 28 Jun 2016 14:49:46 +0800
Subject: [PATCH] have policy_scope always use scope.all or something else to
 ensure it's an ActiveRecord relation

---
 app/policies/application_policy.rb | 2 +-
 app/policies/token_policy.rb       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/policies/application_policy.rb b/app/policies/application_policy.rb
index 39b7a961..e0352be2 100644
--- a/app/policies/application_policy.rb
+++ b/app/policies/application_policy.rb
@@ -55,7 +55,7 @@ class ApplicationPolicy
     end
 
     def resolve
-      scope
+      scope.all
     end
   end
 end
diff --git a/app/policies/token_policy.rb b/app/policies/token_policy.rb
index 393d2441..79ab17ae 100644
--- a/app/policies/token_policy.rb
+++ b/app/policies/token_policy.rb
@@ -4,7 +4,7 @@ class TokenPolicy < ApplicationPolicy
       if user
         scope.where('tokens.user_id = ?', user.id)
       else
-        where(:id => nil).where("id IS NOT ?", nil) # to just return none
+        scope.where(:id => nil).where("id IS NOT ?", nil) # to just return none
       end
     end
   end