summaryrefslogtreecommitdiff
path: root/Gemfile
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
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')
-rw-r--r--Gemfile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile
index d883f851a3f..72fc2de426e 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