diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-06-07 07:45:26 +0000 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-06-07 07:45:26 +0000 |
| commit | 10fd34ba0323bc90af3665ad6fcf5011a112d062 (patch) | |
| tree | d93ba63cec1234c116bf6c91c733e99156968de4 /Gemfile | |
| parent | 06941114ee3acd2c9a0a68e32e98fd0011f5d26f (diff) | |
| parent | 2af2140ceeb2e8dff7c15a23195f5050a11a6ab4 (diff) | |
| download | gitlab-ce-10fd34ba0323bc90af3665ad6fcf5011a112d062.tar.gz | |
Merge branch 'update-net-ssh' into 'master'
update net-ssh 4 -> 5, remove rbnacl, rbnacl-libsodium (not needed)
See merge request gitlab-org/gitlab-ce!19412
Diffstat (limited to 'Gemfile')
| -rw-r--r-- | Gemfile | 5 |
1 files changed, 2 insertions, 3 deletions
@@ -408,13 +408,12 @@ gem 'vmstat', '~> 2.3.0' gem 'sys-filesystem', '~> 1.1.6' # SSH host key support -gem 'net-ssh', '~> 4.2.0' +gem 'net-ssh', '~> 5.0' gem 'sshkey', '~> 1.9.0' # Required for ED25519 SSH host key support group :ed25519 do - gem 'rbnacl-libsodium' - gem 'rbnacl', '~> 4.0' + gem 'ed25519', '~> 1.2' gem 'bcrypt_pbkdf', '~> 1.0' end |