Merge branch '347695-nameerror-uninitialized-constant-net-ssh-authentication-ed25519' into 'master'
Upgrade bcrypt_pbkdf gem to version 1.1.0 See merge request gitlab-org/gitlab!76494
Showing
... | @@ -476,7 +476,7 @@ gem 'sshkey', '~> 2.0' | ... | @@ -476,7 +476,7 @@ gem 'sshkey', '~> 2.0' |
# Required for ED25519 SSH host key support | # Required for ED25519 SSH host key support | ||
group :ed25519 do | group :ed25519 do | ||
gem 'ed25519', '~> 1.2' | gem 'ed25519', '~> 1.2' | ||
gem 'bcrypt_pbkdf', '~> 1.0' | gem 'bcrypt_pbkdf', '~> 1.1' | ||
end | end | ||
# Spamcheck GRPC protocol definitions | # Spamcheck GRPC protocol definitions | ||
... | ... |
Please register or sign in to comment