Merge pull request #833 from zdennis/releases/v1.6.0

Release v1.6.0
zdennis · Mar 15, 2024 · e35713d · e35713d
2 parents 35c335b + 0b22f67
commit e35713d
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -58,7 +58,7 @@ jobs:
           - ruby: '3.0'
             env:
               AR_VERSION: 6.1
-          - ruby: jruby
+          - ruby: jruby-9.4.5.0
             env:
               AR_VERSION: '7.0'
           - ruby: 2.7

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,13 @@
+## Changes in 1.6.0
+
+### New Features
+
+* Add trilogy adapter support. Thanks to @zmariscal via \##825.
+
+### Fixes
+
+* Use the locking_enabled? method provided by activerecord to decide whether the lock field should be updated. Thanks to @dombesz via \##822.
+
 ## Changes in 1.5.1
 
 ### Fixes

diff --git a/lib/activerecord-import/version.rb b/lib/activerecord-import/version.rb
@@ -2,6 +2,6 @@
 
 module ActiveRecord
   module Import
-    VERSION = "1.5.1"
+    VERSION = "1.6.0"
   end
 end