diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-06-07 07:45:26 +0000 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-06-07 07:45:26 +0000 |
| commit | 10fd34ba0323bc90af3665ad6fcf5011a112d062 (patch) | |
| tree | d93ba63cec1234c116bf6c91c733e99156968de4 /Gemfile.rails5.lock | |
| parent | 06941114ee3acd2c9a0a68e32e98fd0011f5d26f (diff) | |
| parent | 2af2140ceeb2e8dff7c15a23195f5050a11a6ab4 (diff) | |
| download | gitlab-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
Diffstat (limited to 'Gemfile.rails5.lock')
| -rw-r--r-- | Gemfile.rails5.lock | 12 |
1 files changed, 4 insertions, 8 deletions
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) |