diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2019-07-09 16:56:18 +0000 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2019-07-09 16:56:18 +0000 |
| commit | ee3fc6d627619d9efddf30237e2928e737d133e2 (patch) | |
| tree | 4c32393609cf9eebcb95ba22b05bf7643bcda704 | |
| parent | 0b92417452b8b9eea191e33ee2082b178ab66cf9 (diff) | |
| parent | 152a100a188a7b7abfdaba27ceec8d3156fb6ab5 (diff) | |
| download | gitlab-ce-ee3fc6d627619d9efddf30237e2928e737d133e2.tar.gz | |
Merge branch 'update-net-ssh' into 'master'
Update net-ssh gem to ~> 5.2
See merge request gitlab-org/gitlab-ce!30341
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -420,7 +420,7 @@ gem 'vmstat', '~> 2.3.0' gem 'sys-filesystem', '~> 1.1.6' # SSH host key support -gem 'net-ssh', '~> 5.0' +gem 'net-ssh', '~> 5.2' gem 'sshkey', '~> 2.0' # Required for ED25519 SSH host key support diff --git a/Gemfile.lock b/Gemfile.lock index c8b8f0e4f90..85b4c32f168 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -523,7 +523,7 @@ GEM mysql2 (0.4.10) nakayoshi_fork (0.0.4) net-ldap (0.16.0) - net-ssh (5.0.1) + net-ssh (5.2.0) netrc (0.11.0) nio4r (2.3.1) nokogiri (1.10.3) @@ -1152,7 +1152,7 @@ DEPENDENCIES mysql2 (~> 0.4.10) nakayoshi_fork (~> 0.0.4) net-ldap - net-ssh (~> 5.0) + net-ssh (~> 5.2) nokogiri (~> 1.10.3) oauth2 (~> 1.4) octokit (~> 4.9) |