summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2019-07-09 16:56:18 +0000
committerRobert Speicher <rspeicher@gmail.com>2019-07-09 16:56:18 +0000
commitee3fc6d627619d9efddf30237e2928e737d133e2 (patch)
tree4c32393609cf9eebcb95ba22b05bf7643bcda704 /Gemfile.lock
parent0b92417452b8b9eea191e33ee2082b178ab66cf9 (diff)
parent152a100a188a7b7abfdaba27ceec8d3156fb6ab5 (diff)
downloadgitlab-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
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock4
1 files changed, 2 insertions, 2 deletions
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)