Skip to content

Commit

Permalink
Merge pull request #833 from zdennis/releases/v1.6.0
Browse files Browse the repository at this point in the history
Release v1.6.0
  • Loading branch information
jkowens authored Mar 15, 2024
2 parents 35c335b + 0b22f67 commit e35713d
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion lib/activerecord-import/version.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@

module ActiveRecord
module Import
VERSION = "1.5.1"
VERSION = "1.6.0"
end
end

0 comments on commit e35713d

Please sign in to comment.