summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Thomas <nick@gitlab.com>2017-08-22 14:36:17 +0100
committerNick Thomas <nick@gitlab.com>2017-08-22 15:23:46 +0100
commitdacca321af806c4955dd32d6402cb38044fa2b00 (patch)
treeef5f4a90a1985ad825eeaddec0aa718e81812679
parentce89c425fe51d2317322350bbd8a364c08d97d21 (diff)
downloadgitlab-ce-dacca321af806c4955dd32d6402cb38044fa2b00.tar.gz
Update the rbnacl gem to 4.0.2
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock6
2 files changed, 4 insertions, 4 deletions
diff --git a/Gemfile b/Gemfile
index a0a9dddac10..df50b61e6fb 100644
--- a/Gemfile
+++ b/Gemfile
@@ -396,7 +396,7 @@ gem 'net-ssh', '~> 4.1.0'
# Required for ED25519 SSH host key support
group :ed25519 do
gem 'rbnacl-libsodium'
- gem 'rbnacl', '~> 3.2'
+ gem 'rbnacl', '~> 4.0'
gem 'bcrypt_pbkdf', '~> 1.0'
end
diff --git a/Gemfile.lock b/Gemfile.lock
index ec8349cd1df..f4f6b630a76 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -203,7 +203,7 @@ GEM
multi_json
fast_gettext (1.4.0)
ffaker (2.4.0)
- ffi (1.9.10)
+ ffi (1.9.18)
flay (2.8.1)
erubis (~> 2.7.0)
path_expander (~> 1.0)
@@ -682,7 +682,7 @@ GEM
rake (12.0.0)
rblineprof (0.3.6)
debugger-ruby_core_source (~> 1.3)
- rbnacl (3.4.0)
+ rbnacl (4.0.2)
ffi
rbnacl-libsodium (1.0.11)
rbnacl (>= 3.0.1)
@@ -1107,7 +1107,7 @@ DEPENDENCIES
rainbow (~> 2.2)
raindrops (~> 0.18)
rblineprof (~> 0.3.6)
- rbnacl (~> 3.2)
+ rbnacl (~> 4.0)
rbnacl-libsodium
rdoc (~> 4.2)
re2 (~> 1.1.1)