summaryrefslogtreecommitdiff
path: root/app/models/personal_access_token.rb
diff options
context:
space:
mode:
authorTimothy Andrew <mail@timothyandrew.net>2016-04-18 15:48:54 +0530
committerTimothy Andrew <mail@timothyandrew.net>2016-04-28 22:28:36 +0530
commite5cf527f279964a8952de544526e8def226b98d7 (patch)
tree02971ecfe27884880d5917e37fc902b91ce803e5 /app/models/personal_access_token.rb
parent1541d1de18c3e7707ce1289f882b4c1262ec8c71 (diff)
downloadgitlab-ce-e5cf527f279964a8952de544526e8def226b98d7.tar.gz
Allow expiration of personal access tokens.
Diffstat (limited to 'app/models/personal_access_token.rb')
-rw-r--r--app/models/personal_access_token.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/personal_access_token.rb b/app/models/personal_access_token.rb
index e5f1f9749f8..dd64374481f 100644
--- a/app/models/personal_access_token.rb
+++ b/app/models/personal_access_token.rb
@@ -1,7 +1,7 @@
class PersonalAccessToken < ActiveRecord::Base
belongs_to :user
- scope :active, -> { where.not(revoked: true) }
+ scope :active, -> { where.not(revoked: true).where("expires_at >= :current", current: Time.current) }
def self.generate(params)
personal_access_token = self.new(params)