Add an "Inactive Personal Access Tokens" section.

- Show the count for each section in parens
- Remove the `revoked?` check, because everything in the
  active section is guaranteed to not be revoked.

1 files changed, 2 insertions, 1 deletions

diff --git a/app/models/personal_access_token.rb b/app/models/personal_access_token.rb
index dd64374481f..fff3f76fb93 100644
--- a/app/models/personal_access_token.rb
+++ b/app/models/personal_access_token.rb
@@ -1,7 +1,8 @@
 class PersonalAccessToken < ActiveRecord::Base
   belongs_to :user
 
-  scope :active, -> { where.not(revoked: true).where("expires_at >= :current", current: Time.current) }
+  scope :active, -> { where(revoked: false).where("expires_at >= :current OR expires_at IS NULL", current: Time.current) }
+  scope :inactive, -> { where("revoked = true OR expires_at < :current", current: Time.current) }
 
   def self.generate(params)
     personal_access_token = self.new(params)