diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-06-20 07:26:25 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-06-20 07:26:25 +0000 |
| commit | 569c207e74cf7a5ae833c72e527dbbca10eccb74 (patch) | |
| tree | 5949bd4654e6602870b5b9cebe7170f3ad3bea36 | |
| parent | 2886ec6af7397e9fd42fb5c099efef48eb20277c (diff) | |
| parent | 4cb996512e3fc4f993aa11fe1a0fcfb20d024f13 (diff) | |
| download | gitlab-ce-569c207e74cf7a5ae833c72e527dbbca10eccb74.tar.gz | |
Merge branch 'cs-update-paranoia' into 'master'
Update paranoia from 2.2 to 2.3.1.
See merge request !12288
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 6 |
2 files changed, 4 insertions, 4 deletions
@@ -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' diff --git a/Gemfile.lock b/Gemfile.lock index 259e18c15b3..a4c95bdedcb 100644 --- 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) |