summaryrefslogtreecommitdiff
path: root/Gemfile
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2018-03-14 18:52:16 +0000
committerDouwe Maan <douwe@gitlab.com>2018-03-14 18:52:16 +0000
commit42629e08b8d27381ad4dbc8159e249a411aa20a1 (patch)
tree9fc401180e18811c2751a9c668d5ba891ea5ab04 /Gemfile
parent2dca1bc04d82ebcf9629a51c5ea285957a5fccda (diff)
parent7480c8afd1c6c1474c3c714a969076a05bd8b76d (diff)
downloadgitlab-ce-42629e08b8d27381ad4dbc8159e249a411aa20a1.tar.gz
Merge branch 'update-net-ssh' into 'master'
Update net-ssh 4.1.0 -> 4.2.0 (Fixes #21734) Closes #21734 See merge request gitlab-org/gitlab-ce!17688
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile
index e164231fcb1..6d3999e3243 100644
--- a/Gemfile
+++ b/Gemfile
@@ -401,7 +401,7 @@ gem 'vmstat', '~> 2.3.0'
gem 'sys-filesystem', '~> 1.1.6'
# SSH host key support
-gem 'net-ssh', '~> 4.1.0'
+gem 'net-ssh', '~> 4.2.0'
gem 'sshkey', '~> 1.9.0'
# Required for ED25519 SSH host key support