diff options
Diffstat (limited to 'app/models/personal_access_token.rb')
-rw-r--r-- | app/models/personal_access_token.rb | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/app/models/personal_access_token.rb b/app/models/personal_access_token.rb index ed78a46eaf3..f69f0e2dccb 100644 --- a/app/models/personal_access_token.rb +++ b/app/models/personal_access_token.rb @@ -1,12 +1,10 @@ # frozen_string_literal: true -class PersonalAccessToken < ActiveRecord::Base +class PersonalAccessToken < ApplicationRecord include Expirable - include IgnorableColumn include TokenAuthenticatable add_authentication_token_field :token, digest: true - ignore_column :token REDIS_EXPIRY_TIME = 3.minutes @@ -58,7 +56,7 @@ class PersonalAccessToken < ActiveRecord::Base protected def validate_scopes - unless revoked || scopes.all? { |scope| Gitlab::Auth.available_scopes.include?(scope.to_sym) } + unless revoked || scopes.all? { |scope| Gitlab::Auth.all_available_scopes.include?(scope.to_sym) } errors.add :scopes, "can only contain available scopes" end end |