Skip to content

Commit 708df54

Browse files
committed
Use new cache format for Rails 7.1
- Update changelog
1 parent 298caea commit 708df54

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
## Master (unreleased)
44

5-
* Add support for Active Support 7.1. [#537][] by [@tomascco][]
5+
* Allow Active Support 7.1. [#537][] by [@tomascco][]
66

77
## 1.6.0 [](https://github.com/activeadmin/arbre/compare/v1.5.0...v1.6.0)
88

spec/rails/rails_spec_helper.rb

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,11 @@
22
require 'spec_helper'
33

44
Combustion.path = 'spec/rails/stub_app'
5-
Combustion.initialize! :action_controller,
6-
:action_view
5+
Combustion.initialize! :action_controller, :action_view do
6+
if Rails.gem_version >= Gem::Version.new("7.1.0")
7+
config.active_support.cache_format_version = 7.1
8+
end
9+
end
710

811
require 'rspec/rails'
912
require 'capybara/rspec'

0 commit comments

Comments
 (0)