From 046f8b597651014cb88c23bdda1b836c7084aa38 Mon Sep 17 00:00:00 2001 From: Jordan Owens Date: Thu, 14 Mar 2024 22:59:38 -0400 Subject: [PATCH 1/3] Bump version to 1.6.0 --- lib/activerecord-import/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/activerecord-import/version.rb b/lib/activerecord-import/version.rb index 425ab636..1b5005e0 100644 --- 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 From d3bcf5bd824431c41a73a268346442e9d8ca8502 Mon Sep 17 00:00:00 2001 From: Jordan Owens Date: Thu, 14 Mar 2024 23:03:06 -0400 Subject: [PATCH 2/3] Update changelog for 1.6.0 --- CHANGELOG.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 18bef994..62d597f7 100644 --- 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 From 0b22f67d5d0f69f86244de8caee658ba80b56430 Mon Sep 17 00:00:00 2001 From: Jordan Owens Date: Thu, 14 Mar 2024 23:32:38 -0400 Subject: [PATCH 3/3] Pin to jruby 9.4.5.0 instead of stable --- .github/workflows/test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index bfb06b3f..43171841 100644 --- 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