summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/gitlab/auth.rb2
-rw-r--r--lib/gitlab/lfs_token.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/auth.rb b/lib/gitlab/auth.rb
index 14e29124aac..f4e6ebb7bc7 100644
--- a/lib/gitlab/auth.rb
+++ b/lib/gitlab/auth.rb
@@ -115,7 +115,7 @@ module Gitlab
def lfs_token_check(login, password)
actor =
- if login =~ /\Alfs-deploy-key-\d+\Z/
+ if login =~ /\Alfs\+deploy-key-\d+\Z/
/\d+\Z/.match(login) do |id|
DeployKey.find(id[0])
end
diff --git a/lib/gitlab/lfs_token.rb b/lib/gitlab/lfs_token.rb
index d7db8017475..edf4dffc4c0 100644
--- a/lib/gitlab/lfs_token.rb
+++ b/lib/gitlab/lfs_token.rb
@@ -30,7 +30,7 @@ module Gitlab
end
def actor_name
- actor.is_a?(User) ? actor.username : "lfs-deploy-key-#{actor.id}"
+ actor.is_a?(User) ? actor.username : "lfs+deploy-key-#{actor.id}"
end
private