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>2022-05-11 21:07:55 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2022-05-11 21:07:55 +0300
commit11df4bf91b8cf9ac7bb601241992e300eebf684c (patch)
treed3c2360dbd3edec006a09ed150267dc202020a91 /lib/gitlab/git_access.rb
parent6282dd78339f98cbc5624e7fdf744a342d3d8b73 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/git_access.rb')
-rw-r--r--lib/gitlab/git_access.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/gitlab/git_access.rb b/lib/gitlab/git_access.rb
index f98fb66ad21..cba63b3c6c7 100644
--- a/lib/gitlab/git_access.rb
+++ b/lib/gitlab/git_access.rb
@@ -177,8 +177,10 @@ module Gitlab
def check_valid_actor!
return unless key?
- unless actor.valid?
+ if !actor.valid?
raise ForbiddenError, "Your SSH key #{actor.errors[:key].first}."
+ elsif actor.expired?
+ raise ForbiddenError, "Your SSH key has expired."
end
end