diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-04-08 18:10:26 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-04-08 18:10:26 +0300 |
commit | 9f9dc2bc412632e6b459d0bb9e1ac205c8cf34af (patch) | |
tree | caafa909017726a087ae4e4bdaeb558ac2c04a9b /lib/gitlab/lfs_token.rb | |
parent | 88bacc889f129f8d95af34f1781dd66769ec27cc (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/lfs_token.rb')
-rw-r--r-- | lib/gitlab/lfs_token.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/lfs_token.rb b/lib/gitlab/lfs_token.rb index 03655eb7237..89b0f0c802f 100644 --- a/lib/gitlab/lfs_token.rb +++ b/lib/gitlab/lfs_token.rb @@ -99,7 +99,7 @@ module Gitlab case actor when DeployKey, Key # Since fingerprint is based on the public key, let's take more bytes from attr_encrypted_db_key_base - actor.fingerprint.delete(':').first(16) + Settings.attr_encrypted_db_key_base_32 + actor.fingerprint_sha256.first(16) + Settings.attr_encrypted_db_key_base_32 when User # Take the last 16 characters as they're more unique than the first 16 actor.id.to_s + actor.encrypted_password.last(16) + Settings.attr_encrypted_db_key_base.first(16) |