Merge pull request #553 from jkowens/releases/v0.26.0

Release v0.26.0
zdennis · Oct 5, 2018 · ace1f6b · ace1f6b
2 parents aea5447 + 42ced86
commit ace1f6b
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,16 @@
+## Changes in 0.26.0
+
+### New Features
+
+* Add  on_duplicate_key_update for SQLite. Thanks to @jkowens via \#542.
+* Add option to update all fields on_duplicate_key_update. Thanks to @aimerald, @jkowens via \#543.
+
+### Fixes
+
+* Handle deeply frozen options hashes. Thanks to @jturkel via \#546.
+* Switch from FactoryGirl to FactoryBot. Thanks to @koic via \#547.
+* Allow import to work with ProxySQL. Thanks to @GregFarrell via \#550.
+
 ## Changes in 0.25.0
 
 ### New Features

diff --git a/lib/activerecord-import/version.rb b/lib/activerecord-import/version.rb
@@ -1,5 +1,5 @@
 module ActiveRecord
   module Import
-    VERSION = "0.25.0".freeze
+    VERSION = "0.26.0".freeze
   end
 end