From d79ef6880ebf8c6cdfd7c1c7fa36d4afa8331efa Mon Sep 17 00:00:00 2001
From: Igor Fedoronchuk <fedoronchuk@gmail.com>
Date: Wed, 8 Apr 2026 12:47:53 +0200
Subject: [PATCH] bump v6.0.0

---
 CHANGELOG.md                       | 29 ++++++++++++++++++++++++++++-
 lib/active_admin_import/version.rb |  2 +-
 2 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 458a8a7..a77830a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,24 @@
 # Changelog
+## [6.0.0] - 2026-04-08
+- **Breaking:** drop EOL Ruby and Rails versions; require Ruby >= 3.1, Rails >= 7.1, ActiveAdmin >= 3.0, activerecord-import >= 2.0
+- Add Rails 8.0 and ActiveAdmin 3.4 / 3.5.1 to the CI matrix
+- Add MySQL 8.0 and PostgreSQL 16 jobs alongside the SQLite matrix #213
+- Switch JavaScript driver from Poltergeist to Cuprite
+- Add `active_admin_import_context` controller convention for injecting request-derived attributes (parent id, current user, request IP, etc.) into every import #211
+- Add `:result_class` option for plugging in a custom `ImportResult` subclass (e.g. to capture inserted ids) #214
+- Action block is now invoked via `instance_exec` with `result, options` as block arguments (matches `DEFAULT_RESULT_PROC`); zero-arity blocks are unaffected #214
+- Fix file caching and format-validation bugs when re-submitting the import form #204
+- Move documentation from the (long-stale) wiki and gh-pages site into the README #215
+- Replace the dead Coveralls badge with a self-hosted shields.io endpoint badge served from GitHub Pages #216
+- Add SimpleCov coverage tracking with a dedicated CI job
+
+## [5.1.0] - 2024-09-19
+- Rails 7.0 support #199 | @gigorok
+- Fix bugs with cached models #201 | @BigG1947
+- Fix `ArgumentError: Number of values (n) exceeds number of columns (m)` #200 | @BigG1947
+- Fix error when an empty CSV is passed and the model has `force_encoding: :auto` | @BigG1947
+- Migrate from Travis to GitHub Actions
+
 ## [5.0.0] - 2021-11-16
 - Ruby 3 compatibility added #190  | @clinejj
 - Support for a non UTF-8 file when zip uploading #185| @naokirin 
@@ -28,6 +48,13 @@
 - Lower dependency of ActiveAdmin to >= 1.0.0.pre2
 - Add possibility to skip columns/values in CSV (batch_slice_columns method)
 
-[Unreleased]: https://github.com/activeadmin-plugins/active_admin_import/compare/v4.0.0...HEAD
+[Unreleased]: https://github.com/activeadmin-plugins/active_admin_import/compare/v6.0.0...HEAD
+[6.0.0]: https://github.com/activeadmin-plugins/active_admin_import/compare/v5.1.0...v6.0.0
+[5.1.0]: https://github.com/activeadmin-plugins/active_admin_import/compare/v5.0.0...v5.1.0
+[5.0.0]: https://github.com/activeadmin-plugins/active_admin_import/compare/v4.2.0...v5.0.0
+[4.2.0]: https://github.com/activeadmin-plugins/active_admin_import/compare/v4.1.2...v4.2.0
+[4.1.2]: https://github.com/activeadmin-plugins/active_admin_import/compare/v4.1.1...v4.1.2
+[4.1.1]: https://github.com/activeadmin-plugins/active_admin_import/compare/v4.1.0...v4.1.1
+[4.1.0]: https://github.com/activeadmin-plugins/active_admin_import/compare/v4.0.0...v4.1.0
 [4.0.0]: https://github.com/activeadmin-plugins/active_admin_import/compare/v3.1.0...v4.0.0
 [3.1.0]: https://github.com/activeadmin-plugins/active_admin_import/compare/3.0.0...v3.1.0
diff --git a/lib/active_admin_import/version.rb b/lib/active_admin_import/version.rb
index 6affade..2588c00 100644
--- a/lib/active_admin_import/version.rb
+++ b/lib/active_admin_import/version.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ActiveAdminImport
-  VERSION = '5.1.0'
+  VERSION = '6.0.0'
 end