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

Update paranoia from 2.2 to 2.3.1. See merge request !12288

Merge branch 'cs-update-paranoia' into 'master'
569c207e · Rémy Coutable · 2886ec6a · 4cb99651 · 569c207e · 569c207e
Commit 569c207e authored Jun 20, 2017 by Rémy Coutable
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

Gemfile Gemfile +1 -1

Gemfile.lock Gemfile.lock +3 -3

No files found.
--- 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'

--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -546,8 +546,8 @@ GEM
      rubypants (~> 0.2)
    orm_adapter (0.5.0)
    os (0.9.6)
-    paranoia (2.2.0)
-      activerecord (>= 4.0, < 5.1)
+    paranoia (2.3.1)
+      activerecord (>= 4.0, < 5.2)
    parser (2.4.0.0)
      ast (~> 2.2)
    path_expander (1.0.1)
@@ -1031,7 +1031,7 @@ DEPENDENCIES
  omniauth-twitter (~> 1.2.0)
  omniauth_crowd (~> 2.2.0)
  org-ruby (~> 0.9.12)
-  paranoia (~> 2.2)
+  paranoia (~> 2.3.1)
  peek (~> 1.0.1)
  peek-gc (~> 0.0.2)
  peek-host (~> 1.0.0)