summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2017-08-23 13:27:59 +0000
committerDouwe Maan <douwe@gitlab.com>2017-08-23 13:27:59 +0000
commit84c2085e94ddc3b813b18b0208b30b31fb66dac4 (patch)
tree779013e19ffd12c84af5376bf78ad5e76151ebc9 /Gemfile.lock
parentd546f7d36e6703bda430e2f50fe4e87a07ab48f8 (diff)
parentdacca321af806c4955dd32d6402cb38044fa2b00 (diff)
downloadgitlab-ce-84c2085e94ddc3b813b18b0208b30b31fb66dac4.tar.gz
Merge branch '36806-update-rbnacl' into 'master'
Update the rbnacl gem to 4.0.2 Closes #36806 See merge request !13740
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock6
1 files changed, 3 insertions, 3 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index e4b721279b0..7d3c53ee010 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)