From 23ec63edbe1a6ae710425a0242e946625cfcbf8b Mon Sep 17 00:00:00 2001 From: John Hawthorn Date: Mon, 9 Apr 2018 16:40:08 -0700 Subject: [PATCH 1/2] Specify Rails 5.2.0 proper --- .travis.yml | 4 ++-- Gemfile | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 43642d8b..8828fbfa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,7 +14,7 @@ env: - RAILS='~> 4.2.0' - RAILS='~> 5.0.0' - RAILS='~> 5.1.0' - - RAILS='~> 5.2.0.rc2' + - RAILS='~> 5.2.0' matrix: allow_failures: @@ -24,5 +24,5 @@ matrix: rvm: jruby-9.1.6.0 - env: RAILS='~> 5.1.0' rvm: jruby-9.1.6.0 - - env: RAILS='~> 5.2.0.rc2' + - env: RAILS='~> 5.2.0' rvm: jruby-9.1.6.0 diff --git a/Gemfile b/Gemfile index 00aa35d8..fbc29caa 100644 --- a/Gemfile +++ b/Gemfile @@ -12,7 +12,7 @@ platforms :rbx do gem 'rubinius-developer_tools' end -rails = ENV['RAILS'] || '~> 5.1.0' +rails = ENV['RAILS'] || '~> 5.2.0' gem 'rails', rails From 35e671680ef233e55ea8f89e9a5db27afa6a2aa2 Mon Sep 17 00:00:00 2001 From: John Hawthorn Date: Tue, 10 Apr 2018 10:54:40 -0700 Subject: [PATCH 2/2] Version 2.4.1 --- CHANGELOG.md | 6 ++++++ lib/paranoia/version.rb | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a1cd353d..4798c3d3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # paranoia Changelog +## 2.4.1 + +* [#435](https://github.com/rubysherpas/paranoia/pull/435) Monkeypatch activerecord relations to work with rails 6.2.0 + + [Bartosz Bonisławski (@bbonislawski)](https://github.com/bbonislawski) + ## 2.4.0 * [#423](https://github.com/rubysherpas/paranoia/pull/423) Add `paranoia_destroy` and `paranoia_delete` aliases diff --git a/lib/paranoia/version.rb b/lib/paranoia/version.rb index a31bde3b..1b2fb121 100644 --- a/lib/paranoia/version.rb +++ b/lib/paranoia/version.rb @@ -1,3 +1,3 @@ module Paranoia - VERSION = '2.4.0'.freeze + VERSION = '2.4.1'.freeze end