Commit 569c207e authored by Rémy Coutable's avatar Rémy Coutable

Merge branch 'cs-update-paranoia' into 'master'

Update paranoia from 2.2 to 2.3.1.

See merge request !12288
parents 2886ec6a 4cb99651
...@@ -373,7 +373,7 @@ gem 'ruby-prof', '~> 0.16.2' ...@@ -373,7 +373,7 @@ gem 'ruby-prof', '~> 0.16.2'
gem 'oauth2', '~> 1.4' gem 'oauth2', '~> 1.4'
# Soft deletion # Soft deletion
gem 'paranoia', '~> 2.2' gem 'paranoia', '~> 2.3.1'
# Health check # Health check
gem 'health_check', '~> 2.6.0' gem 'health_check', '~> 2.6.0'
......
...@@ -546,8 +546,8 @@ GEM ...@@ -546,8 +546,8 @@ GEM
rubypants (~> 0.2) rubypants (~> 0.2)
orm_adapter (0.5.0) orm_adapter (0.5.0)
os (0.9.6) os (0.9.6)
paranoia (2.2.0) paranoia (2.3.1)
activerecord (>= 4.0, < 5.1) activerecord (>= 4.0, < 5.2)
parser (2.4.0.0) parser (2.4.0.0)
ast (~> 2.2) ast (~> 2.2)
path_expander (1.0.1) path_expander (1.0.1)
...@@ -1031,7 +1031,7 @@ DEPENDENCIES ...@@ -1031,7 +1031,7 @@ DEPENDENCIES
omniauth-twitter (~> 1.2.0) omniauth-twitter (~> 1.2.0)
omniauth_crowd (~> 2.2.0) omniauth_crowd (~> 2.2.0)
org-ruby (~> 0.9.12) org-ruby (~> 0.9.12)
paranoia (~> 2.2) paranoia (~> 2.3.1)
peek (~> 1.0.1) peek (~> 1.0.1)
peek-gc (~> 0.0.2) peek-gc (~> 0.0.2)
peek-host (~> 1.0.0) peek-host (~> 1.0.0)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment