diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-16 21:18:33 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-16 21:18:33 +0300 |
commit | f64a639bcfa1fc2bc89ca7db268f594306edfd7c (patch) | |
tree | a2c3c2ebcc3b45e596949db485d6ed18ffaacfa1 /app/models/personal_access_token.rb | |
parent | bfbc3e0d6583ea1a91f627528bedc3d65ba4b10f (diff) |
Add latest changes from gitlab-org/gitlab@13-10-stable-eev13.10.0-rc40
Diffstat (limited to 'app/models/personal_access_token.rb')
-rw-r--r-- | app/models/personal_access_token.rb | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/app/models/personal_access_token.rb b/app/models/personal_access_token.rb index 3b07551fe05..ad2f4525171 100644 --- a/app/models/personal_access_token.rb +++ b/app/models/personal_access_token.rb @@ -4,6 +4,7 @@ class PersonalAccessToken < ApplicationRecord include Expirable include TokenAuthenticatable include Sortable + include EachBatch extend ::Gitlab::Utils::Override add_authentication_token_field :token, digest: true @@ -97,6 +98,10 @@ class PersonalAccessToken < ApplicationRecord end def set_default_scopes + # When only loading a select set of attributes, for example using `EachBatch`, + # the `scopes` attribute is not present, so we can't initialize it. + return unless has_attribute?(:scopes) + self.scopes = Gitlab::Auth::DEFAULT_SCOPES if self.scopes.empty? end |