Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app/models/personal_access_token.rb')
-rw-r--r--app/models/personal_access_token.rb7
1 files changed, 6 insertions, 1 deletions
diff --git a/app/models/personal_access_token.rb b/app/models/personal_access_token.rb
index 4dfe7252a0c..f2fbb5b989e 100644
--- a/app/models/personal_access_token.rb
+++ b/app/models/personal_access_token.rb
@@ -44,8 +44,9 @@ class PersonalAccessToken < ApplicationRecord
scope :last_used_after, -> (date) { where("last_used_at >= ?", date) }
validates :scopes, presence: true
+ validates :expires_at, presence: true, on: :create, unless: :allow_expires_at_to_be_empty?
+
validate :validate_scopes
- validates :expires_at, presence: true, on: :create
validate :expires_at_before_instance_max_expiry_date, on: :create
def revoke!
@@ -97,6 +98,10 @@ class PersonalAccessToken < ApplicationRecord
self.class.token_prefix
end
+ def allow_expires_at_to_be_empty?
+ false
+ end
+
def expires_at_before_instance_max_expiry_date
return unless expires_at