Commit 59e842e5 authored by Jarka Košanová's avatar Jarka Košanová

Merge branch 'pravi/gitlab-update-net-ssh' into 'master'

Update net-ssh 5.2 -> 6.0

See merge request gitlab-org/gitlab!30492
parents e0539ecc ad070354
......@@ -445,7 +445,7 @@ gem 'sys-filesystem', '~> 1.1.6'
gem 'net-ntp'
# SSH host key support
gem 'net-ssh', '~> 5.2'
gem 'net-ssh', '~> 6.0'
gem 'sshkey', '~> 2.0'
# Required for ED25519 SSH host key support
......
......@@ -653,7 +653,7 @@ GEM
nenv (0.3.0)
net-ldap (0.16.2)
net-ntp (2.1.3)
net-ssh (5.2.0)
net-ssh (6.0.0)
netrc (0.11.0)
nio4r (2.5.2)
no_proxy_fix (0.1.2)
......@@ -1301,7 +1301,7 @@ DEPENDENCIES
nakayoshi_fork (~> 0.0.4)
net-ldap
net-ntp
net-ssh (~> 5.2)
net-ssh (~> 6.0)
nokogiri (~> 1.10.9)
oauth2 (~> 1.4)
octokit (~> 4.15)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment