diff options
author | Connor Shea <connor.james.shea@gmail.com> | 2017-06-19 16:28:32 -0600 |
---|---|---|
committer | Connor Shea <connor.james.shea@gmail.com> | 2017-06-19 16:28:32 -0600 |
commit | 4cb996512e3fc4f993aa11fe1a0fcfb20d024f13 (patch) | |
tree | eb3b541821ee7bade23dd51ab8cb858ab0a4ae41 | |
parent | 025cbc2ad4dc175634676ff8a6955e043512d8bf (diff) | |
download | gitlab-ce-cs-update-paranoia.tar.gz |
Update paranoia from 2.2 to 2.3.1.cs-update-paranoia
https://github.com/rubysherpas/paranoia/blob/core/CHANGELOG.md#230-2017-04-14
Adds support for Rails 5.1.
-rw-r--r-- | Gemfile | 2 | ||||
-rw-r--r-- | Gemfile.lock | 8 |
2 files changed, 5 insertions, 5 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 6755c75e331..f39371b6978 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) @@ -1119,4 +1119,4 @@ DEPENDENCIES wikicloth (= 0.8.1) BUNDLED WITH - 1.15.0 + 1.15.1 |