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:
authorGitLab Bot <gitlab-bot@gitlab.com>2023-12-14 03:08:01 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2023-12-14 03:08:01 +0300
commitc4fad7502e407e6d744206fe1b235bc2e3a44d98 (patch)
treef869522e2eec3ea5fe30d548d51c7ed5db9d751c /app/services
parent0fea036ba7c8d26ffeecc7f52bf770ea3a88689e (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/services')
-rw-r--r--app/services/personal_access_tokens/create_service.rb6
1 files changed, 5 insertions, 1 deletions
diff --git a/app/services/personal_access_tokens/create_service.rb b/app/services/personal_access_tokens/create_service.rb
index 31ba88af46c..095cfadf02c 100644
--- a/app/services/personal_access_tokens/create_service.rb
+++ b/app/services/personal_access_tokens/create_service.rb
@@ -41,7 +41,11 @@ module PersonalAccessTokens
end
def pat_expiration
- params[:expires_at].presence || PersonalAccessToken::MAX_PERSONAL_ACCESS_TOKEN_LIFETIME_IN_DAYS.days.from_now
+ params[:expires_at].presence || max_expiry_date
+ end
+
+ def max_expiry_date
+ PersonalAccessToken::MAX_PERSONAL_ACCESS_TOKEN_LIFETIME_IN_DAYS.days.from_now
end
def creation_permitted?