diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-19 18:09:08 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-19 18:09:08 +0300 |
| commit | 6a3c4476fa8f1c686eadbed05262bce95504ffa7 (patch) | |
| tree | d6e29b8f855e704d560d40df0726ba52e74aebca /lib/gitlab/crypto_helper.rb | |
| parent | c6af94ea4ea649171ff930b6bf94c73a5d03edb9 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/crypto_helper.rb')
| -rw-r--r-- | lib/gitlab/crypto_helper.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/gitlab/crypto_helper.rb b/lib/gitlab/crypto_helper.rb index 56d80a5a5d7..c113cebd72f 100644 --- a/lib/gitlab/crypto_helper.rb +++ b/lib/gitlab/crypto_helper.rb @@ -25,8 +25,7 @@ module Gitlab return unless value encrypted_token = Base64.decode64(value) - decrypted_token = Encryptor.decrypt(AES256_GCM_OPTIONS.merge(value: encrypted_token, iv: nonce)) - decrypted_token + Encryptor.decrypt(AES256_GCM_OPTIONS.merge(value: encrypted_token, iv: nonce)) end end end |