diff --git a/CHANGELOG.md b/CHANGELOG.md index c26e3fb5..c814c073 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,8 @@ ## Unreleased - Use jQuery 2.x - 2.2.4 - - If there are `//= require jquery` clauses in the main application, replace them with `//= require jquery2` + - If there are `//= require jquery` clauses in the main application, replace them with `//= require jquery2` +- Add Ruby 3.3 and Rails 7.2 to CI ## [2.7.5](https://github.com/owen2345/camaleon-cms/tree/2.7.5) (2023-11-22) - Fix the test email for non-main sites by [brian-kephart](https://github.com/brian-kephart) in [\#1050](https://github.com/owen2345/camaleon-cms/pull/1050) diff --git a/gemfiles/rails_edge.gemfile b/gemfiles/rails_edge.gemfile index b37392e8..da3b3a37 100644 --- a/gemfiles/rails_edge.gemfile +++ b/gemfiles/rails_edge.gemfile @@ -6,7 +6,7 @@ gem 'cancancan', '~> 3.0' gem 'capybara-screenshot' gem 'factory_bot_rails' gem 'faker' -gem 'non-digest-assets', '~> 2.3' +gem 'non-digest-assets', git: 'https://github.com/texpert/non-digest-assets', branch: 'add-rails-7-2-to-ci' gem 'oj' gem 'puma' gem 'rack_session_access'