summaryrefslogtreecommitdiff
path: root/Gemfile
diff options
context:
space:
mode:
authorNick Thomas <nick@gitlab.com>2017-08-03 13:19:11 +0100
committerNick Thomas <nick@gitlab.com>2017-08-07 19:17:11 +0100
commitda5262f4e6d9524b2af2ad8f6c8ebe10edf17169 (patch)
treea26da5b83832daea538b1a927403fc66422b8c48 /Gemfile
parentbfac6ce6e4a2415b76db1cd7321e312457c7ee89 (diff)
downloadgitlab-ce-da5262f4e6d9524b2af2ad8f6c8ebe10edf17169.tar.gz
Backport changes in https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2551 to CE
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile10
1 files changed, 10 insertions, 0 deletions
diff --git a/Gemfile b/Gemfile
index 37a4eb5fde4..f27ba905b4f 100644
--- a/Gemfile
+++ b/Gemfile
@@ -390,6 +390,16 @@ gem 'health_check', '~> 2.6.0'
gem 'vmstat', '~> 2.3.0'
gem 'sys-filesystem', '~> 1.1.6'
+# SSH host key support
+gem 'net-ssh', '~> 4.1.0'
+
+# Required for ED25519 SSH host key support
+group :ed25519 do
+ gem 'rbnacl-libsodium'
+ gem 'rbnacl', '~> 3.2'
+ gem 'bcrypt_pbkdf', '~> 1.0'
+end
+
# Gitaly GRPC client
gem 'gitaly', '~> 0.24.0'