summaryrefslogtreecommitdiff
path: root/Gemfile
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2017-06-20 07:26:25 +0000
committerRémy Coutable <remy@rymai.me>2017-06-20 07:26:25 +0000
commit569c207e74cf7a5ae833c72e527dbbca10eccb74 (patch)
tree5949bd4654e6602870b5b9cebe7170f3ad3bea36 /Gemfile
parent2886ec6af7397e9fd42fb5c099efef48eb20277c (diff)
parent4cb996512e3fc4f993aa11fe1a0fcfb20d024f13 (diff)
downloadgitlab-ce-569c207e74cf7a5ae833c72e527dbbca10eccb74.tar.gz
Merge branch 'cs-update-paranoia' into 'master'
Update paranoia from 2.2 to 2.3.1. See merge request !12288
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile
index 88d4daef086..ff6acedd7a8 100644
--- a/Gemfile
+++ b/Gemfile
@@ -373,7 +373,7 @@ gem 'ruby-prof', '~> 0.16.2'
gem 'oauth2', '~> 1.4'
# Soft deletion
-gem 'paranoia', '~> 2.2'
+gem 'paranoia', '~> 2.3.1'
# Health check
gem 'health_check', '~> 2.6.0'