summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzegorz@gitlab.com>2018-06-07 07:45:26 +0000
committerGrzegorz Bizon <grzegorz@gitlab.com>2018-06-07 07:45:26 +0000
commit10fd34ba0323bc90af3665ad6fcf5011a112d062 (patch)
treed93ba63cec1234c116bf6c91c733e99156968de4
parent06941114ee3acd2c9a0a68e32e98fd0011f5d26f (diff)
parent2af2140ceeb2e8dff7c15a23195f5050a11a6ab4 (diff)
downloadgitlab-ce-10fd34ba0323bc90af3665ad6fcf5011a112d062.tar.gz
Merge branch 'update-net-ssh' into 'master'
update net-ssh 4 -> 5, remove rbnacl, rbnacl-libsodium (not needed) See merge request gitlab-org/gitlab-ce!19412
-rw-r--r--Gemfile5
-rw-r--r--Gemfile.lock12
-rw-r--r--Gemfile.rails5.lock12
3 files changed, 10 insertions, 19 deletions
diff --git a/Gemfile b/Gemfile
index 4c63f4c10b8..339761bf8fa 100644
--- a/Gemfile
+++ b/Gemfile
@@ -408,13 +408,12 @@ gem 'vmstat', '~> 2.3.0'
gem 'sys-filesystem', '~> 1.1.6'
# SSH host key support
-gem 'net-ssh', '~> 4.2.0'
+gem 'net-ssh', '~> 5.0'
gem 'sshkey', '~> 1.9.0'
# Required for ED25519 SSH host key support
group :ed25519 do
- gem 'rbnacl-libsodium'
- gem 'rbnacl', '~> 4.0'
+ gem 'ed25519', '~> 1.2'
gem 'bcrypt_pbkdf', '~> 1.0'
end
diff --git a/Gemfile.lock b/Gemfile.lock
index 334895351ac..20fe5daa58e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -177,6 +177,7 @@ GEM
json-jwt (~> 1.6)
dropzonejs-rails (0.7.2)
rails (> 3.1)
+ ed25519 (1.2.4)
email_reply_trimmer (0.1.6)
email_spec (2.2.0)
htmlentities (~> 4.3.3)
@@ -510,7 +511,7 @@ GEM
mustermann (~> 1.0.0)
mysql2 (0.4.10)
net-ldap (0.16.0)
- net-ssh (4.2.0)
+ net-ssh (5.0.1)
netrc (0.11.0)
nokogiri (1.8.2)
mini_portile2 (~> 2.3.0)
@@ -696,10 +697,6 @@ GEM
ffi (>= 0.5.0, < 2)
rblineprof (0.3.6)
debugger-ruby_core_source (~> 1.3)
- rbnacl (4.0.2)
- ffi
- rbnacl-libsodium (1.0.11)
- rbnacl (>= 3.0.1)
rdoc (6.0.4)
re2 (1.1.1)
recaptcha (3.0.0)
@@ -1016,6 +1013,7 @@ DEPENDENCIES
doorkeeper (~> 4.3)
doorkeeper-openid_connect (~> 1.3)
dropzonejs-rails (~> 0.7.1)
+ ed25519 (~> 1.2)
email_reply_trimmer (~> 0.1)
email_spec (~> 2.2.0)
factory_bot_rails (~> 4.8.2)
@@ -1088,7 +1086,7 @@ DEPENDENCIES
mousetrap-rails (~> 1.4.6)
mysql2 (~> 0.4.10)
net-ldap
- net-ssh (~> 4.2.0)
+ net-ssh (~> 5.0)
nokogiri (~> 1.8.2)
oauth2 (~> 1.4)
octokit (~> 4.9)
@@ -1130,8 +1128,6 @@ DEPENDENCIES
rainbow (~> 2.2)
raindrops (~> 0.18)
rblineprof (~> 0.3.6)
- rbnacl (~> 4.0)
- rbnacl-libsodium
rdoc (~> 6.0)
re2 (~> 1.1.1)
recaptcha (~> 3.0)
diff --git a/Gemfile.rails5.lock b/Gemfile.rails5.lock
index 14ea3e4519c..bee13dd1d53 100644
--- a/Gemfile.rails5.lock
+++ b/Gemfile.rails5.lock
@@ -179,6 +179,7 @@ GEM
json-jwt (~> 1.6)
dropzonejs-rails (0.7.4)
rails (> 3.1)
+ ed25519 (1.2.4)
email_reply_trimmer (0.1.10)
email_spec (2.2.0)
htmlentities (~> 4.3.3)
@@ -505,7 +506,7 @@ GEM
mustermann (~> 1.0.0)
mysql2 (0.4.10)
net-ldap (0.16.1)
- net-ssh (4.2.0)
+ net-ssh (5.0.1)
netrc (0.11.0)
nio4r (2.3.1)
nokogiri (1.8.2)
@@ -696,10 +697,6 @@ GEM
ffi (>= 0.5.0, < 2)
rblineprof (0.3.7)
debugger-ruby_core_source (~> 1.3)
- rbnacl (4.0.2)
- ffi
- rbnacl-libsodium (1.0.16)
- rbnacl (>= 3.0.1)
rdoc (6.0.4)
re2 (1.1.1)
recaptcha (3.4.0)
@@ -1017,6 +1014,7 @@ DEPENDENCIES
doorkeeper (~> 4.3)
doorkeeper-openid_connect (~> 1.3)
dropzonejs-rails (~> 0.7.1)
+ ed25519 (~> 1.2)
email_reply_trimmer (~> 0.1)
email_spec (~> 2.2.0)
factory_bot_rails (~> 4.8.2)
@@ -1087,7 +1085,7 @@ DEPENDENCIES
mousetrap-rails (~> 1.4.6)
mysql2 (~> 0.4.10)
net-ldap
- net-ssh (~> 4.2.0)
+ net-ssh (~> 5.0)
nokogiri (~> 1.8.2)
oauth2 (~> 1.4)
octokit (~> 4.9)
@@ -1130,8 +1128,6 @@ DEPENDENCIES
rainbow (~> 2.2)
raindrops (~> 0.18)
rblineprof (~> 0.3.6)
- rbnacl (~> 4.0)
- rbnacl-libsodium
rdoc (~> 6.0)
re2 (~> 1.1.1)
recaptcha (~> 3.0)