kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

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

Browse source 
Update net-ssh gem to ~> 5.2

See merge request gitlab-org/gitlab-ce!30341
This commit is contained in:
Robert Speicher 2019-07-09 16:56:18 +00:00
commit ee3fc6d627
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Gemfile
View file

@ -420,7 +420,7 @@ gem 'vmstat', '~> 2.3.0'
gem 'sys-filesystem', '~> 1.1.6' gem 'sys-filesystem', '~> 1.1.6'
# 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

4
Gemfile.lock
View file

@ -523,7 +523,7 @@ GEM
mysql2 (0.4.10) mysql2 (0.4.10)
nakayoshi_fork (0.0.4) nakayoshi_fork (0.0.4)
net-ldap (0.16.0) net-ldap (0.16.0)
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)
@ -1152,7 +1152,7 @@ DEPENDENCIES
mysql2 (~> 0.4.10) mysql2 (~> 0.4.10)
nakayoshi_fork (~> 0.0.4) nakayoshi_fork (~> 0.0.4)
net-ldap net-ldap
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)