diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-12-05 12:06:32 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-12-05 12:06:32 +0000 |
| commit | 9cbee6ecf34191d04c0c85be79828fb08de2abf6 (patch) | |
| tree | 01c28ae75d511a553960bf918b6a8964da8c9729 | |
| parent | c5d5dfe83341dc49c0a38e051724421a6571972e (diff) | |
| parent | 7ee0d651a3ada02373969f40330b3baf0fb26427 (diff) | |
| download | gitlab-ce-9cbee6ecf34191d04c0c85be79828fb08de2abf6.tar.gz | |
Merge branch 'cs-upgrade-paranoia' into 'master'
Update paranoia from 2.1.4 to 2.2.0.
Working toward #14286.
Includes support for Rails 5.
Changelog: https://github.com/rubysherpas/paranoia/blob/879fd18caa46af70fceca2e8f46886b3eff072ec/CHANGELOG.md#220-2016-10-21
See merge request !7922
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 6 |
2 files changed, 4 insertions, 4 deletions
@@ -338,7 +338,7 @@ gem 'ruby-prof', '~> 0.16.2' gem 'oauth2', '~> 1.2.0' # Soft deletion -gem 'paranoia', '~> 2.0' +gem 'paranoia', '~> 2.2' # Health check gem 'health_check', '~> 2.2.0' diff --git a/Gemfile.lock b/Gemfile.lock index 5a14ed6fede..e5e6e6895a8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -460,8 +460,8 @@ GEM org-ruby (0.9.12) rubypants (~> 0.2) orm_adapter (0.5.0) - paranoia (2.1.4) - activerecord (~> 4.0) + paranoia (2.2.0) + activerecord (>= 4.0, < 5.1) parser (2.3.1.4) ast (~> 2.2) pg (0.18.4) @@ -887,7 +887,7 @@ DEPENDENCIES omniauth-twitter (~> 1.2.0) omniauth_crowd (~> 2.2.0) org-ruby (~> 0.9.12) - paranoia (~> 2.0) + paranoia (~> 2.2) pg (~> 0.18.2) poltergeist (~> 1.9.0) premailer-rails (~> 1.9.0) |