Commit 3964351d authored by Robert Speicher's avatar Robert Speicher

Merge branch 'ee-update-net-ssh' into 'master'

Update net-ssh gem to ~> 5.2

See merge request gitlab-org/gitlab-ee!14613
parents f706ae92 69991e8f
...@@ -438,7 +438,7 @@ gem 'sys-filesystem', '~> 1.1.6' ...@@ -438,7 +438,7 @@ gem 'sys-filesystem', '~> 1.1.6'
gem 'net-ntp' gem 'net-ntp'
# SSH host key support # SSH host key support
gem 'net-ssh', '~> 5.0' gem 'net-ssh', '~> 5.2'
gem 'sshkey', '~> 2.0' gem 'sshkey', '~> 2.0'
# Required for ED25519 SSH host key support # Required for ED25519 SSH host key support
......
...@@ -554,7 +554,7 @@ GEM ...@@ -554,7 +554,7 @@ GEM
net-dns (0.9.0) net-dns (0.9.0)
net-ldap (0.16.0) net-ldap (0.16.0)
net-ntp (2.1.3) net-ntp (2.1.3)
net-ssh (5.0.1) net-ssh (5.2.0)
netrc (0.11.0) netrc (0.11.0)
nio4r (2.3.1) nio4r (2.3.1)
nokogiri (1.10.3) nokogiri (1.10.3)
...@@ -1194,7 +1194,7 @@ DEPENDENCIES ...@@ -1194,7 +1194,7 @@ DEPENDENCIES
net-dns (~> 0.9.0) net-dns (~> 0.9.0)
net-ldap net-ldap
net-ntp net-ntp
net-ssh (~> 5.0) net-ssh (~> 5.2)
nokogiri (~> 1.10.3) nokogiri (~> 1.10.3)
oauth2 (~> 1.4) oauth2 (~> 1.4)
octokit (~> 4.9) octokit (~> 4.9)
......
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