Merge pull request rubysherpas#439 from jhawthorn/version_2_4_1

Version 2.4.1
andyklimczak · Apr 10, 2018 · a535372 · a535372
2 parents 9a26d81 + 35e6716
commit a535372
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git 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/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/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
 

diff --git 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