From ca232e70b37ac2a01e4ec159c81df842b556148e Mon Sep 17 00:00:00 2001 From: Mitsuhiro Shibuya Date: Sun, 6 Oct 2024 19:06:23 +0900 Subject: [PATCH 1/7] Avoid newer turbo-rails for Ruby 2.6 build Refs. https://github.com/hotwired/turbo-rails/issues/681 --- Appraisals | 2 +- gemfiles/rails_6.0.gemfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Appraisals b/Appraisals index fc378a6d4..ca42f1938 100644 --- a/Appraisals +++ b/Appraisals @@ -3,7 +3,7 @@ appraise 'rails-6.0' do gem 'rails', '~> 6.0.0' gem 'psych', '~> 3.3' - gem 'turbo-rails', ['!= 2.0.8', '!= 2.0.9'] + gem 'turbo-rails', '< 2.0.8' group :test do gem 'cancancan', ['~> 3.0', '< 3.6'] diff --git a/gemfiles/rails_6.0.gemfile b/gemfiles/rails_6.0.gemfile index bcf282264..b57ca868d 100644 --- a/gemfiles/rails_6.0.gemfile +++ b/gemfiles/rails_6.0.gemfile @@ -7,7 +7,7 @@ gem "devise", "~> 4.7" gem "net-smtp", require: false gem "rails", "~> 6.0.0" gem "sassc-rails", "~> 2.1" -gem "turbo-rails", ["!= 2.0.8", "!= 2.0.9"] +gem "turbo-rails", "< 2.0.8" gem "vite_rails", require: false gem "webpacker", require: false gem "webrick" From 44579f0a1f910e675de3513725692a28a5ca86dc Mon Sep 17 00:00:00 2001 From: Mitsuhiro Shibuya Date: Sun, 6 Oct 2024 18:56:29 +0900 Subject: [PATCH 2/7] Install ImageMagick as it's no longer included in 24.04 image --- .github/workflows/test.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 014103973..882f24ee8 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -133,6 +133,8 @@ jobs: uses: actions/setup-node@v4 with: node-version: "18" + - name: Install ImageMagick + run: sudo apt-get install imagemagick - name: Setup application env: BUNDLE_GEMFILE: ../../${{ matrix.gemfile }} From f54a102c6b0a420244ef044503944574ef1dfbd2 Mon Sep 17 00:00:00 2001 From: Mitsuhiro Shibuya Date: Sun, 6 Oct 2024 18:32:59 +0900 Subject: [PATCH 3/7] Disable Turbo's prefetch, which became default in turbo-rails 2.x Fixes #3701 --- app/views/layouts/rails_admin/_head.html.erb | 1 + spec/integration/rails_admin_spec.rb | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/app/views/layouts/rails_admin/_head.html.erb b/app/views/layouts/rails_admin/_head.html.erb index d78e4366f..43ce0096d 100644 --- a/app/views/layouts/rails_admin/_head.html.erb +++ b/app/views/layouts/rails_admin/_head.html.erb @@ -2,6 +2,7 @@ + <%= csrf_meta_tag %> <% case RailsAdmin::config.asset_source when :webpacker %> diff --git a/spec/integration/rails_admin_spec.rb b/spec/integration/rails_admin_spec.rb index 8040dcc82..26bb603f6 100644 --- a/spec/integration/rails_admin_spec.rb +++ b/spec/integration/rails_admin_spec.rb @@ -204,6 +204,13 @@ is_expected.to have_content 'Player failed to be updated' is_expected.to have_css '.filtering-select[data-input-for="player_team_id"]' end + + it 'does not prefetch pages' do + allow_any_instance_of(RailsAdmin::Config::Actions::Index).to receive(:controller).and_raise('index prefetched') + visit dashboard_path + find('.sidebar a.nav-link[href$="/player"]').hover + sleep 0.3 # Turbo waits 100ms before prefetch + end end describe 'dom_ready events', js: true do From b09f770d9f2b743626d5f29ac9449dbcce9e5c70 Mon Sep 17 00:00:00 2001 From: Mitsuhiro Shibuya Date: Thu, 10 Oct 2024 23:16:23 +0900 Subject: [PATCH 4/7] Version 3.2.1 --- CHANGELOG.md | 10 +++++++++- lib/rails_admin/version.rb | 2 +- package.json | 2 +- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index da3e7f896..fb7e5bfe7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,15 @@ ## [Unreleased](https://github.com/railsadminteam/rails_admin/tree/HEAD) -[Full Changelog](https://github.com/railsadminteam/rails_admin/compare/v3.2.0...HEAD) +[Full Changelog](https://github.com/railsadminteam/rails_admin/compare/v3.2.1...HEAD) + +## [3.2.1](https://github.com/railsadminteam/rails_admin/tree/v3.2.0) - 2024-10-10 + +[Full Changelog](https://github.com/railsadminteam/rails_admin/compare/v3.2.0...v3.2.1) + +### Fixed + +- Disable Turbo's prefetch behavior globally, to prevent custom actions unintentionally triggered ([f54a102](https://github.com/railsadminteam/rails_admin/commit/f54a102c6b0a420244ef044503944574ef1dfbd2), [#3701](https://github.com/railsadminteam/rails_admin/issues/3701)) ## [3.2.0](https://github.com/railsadminteam/rails_admin/tree/v3.2.0) - 2024-09-08 diff --git a/lib/rails_admin/version.rb b/lib/rails_admin/version.rb index bac655f18..f0c989f0b 100644 --- a/lib/rails_admin/version.rb +++ b/lib/rails_admin/version.rb @@ -4,7 +4,7 @@ module RailsAdmin class Version MAJOR = 3 MINOR = 2 - PATCH = 0 + PATCH = 1 PRE = nil class << self diff --git a/package.json b/package.json index f46a77587..7a5e2b108 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "rails_admin", - "version": "3.2.0", + "version": "3.2.1", "description": "RailsAdmin is a Rails engine that provides an easy-to-use interface for managing your data.", "homepage": "https://github.com/railsadminteam/rails_admin", "license": "MIT", From 541285733737f8a79abcac2372f9e2074cc714b8 Mon Sep 17 00:00:00 2001 From: Jan-Willem van der Meer Date: Sat, 23 Nov 2024 09:24:11 +0100 Subject: [PATCH 5/7] Test against rails 8.0 (#3702) * test against rails 8.0 * allow rails 8 * Require more recent version of sqlite for rails 8 * Upgrade required sqlite version to 2.2, fix json spec * Make sure the dummy uses sqlite3 2.2 as well * Only upgrade sqlite3 for rails 8 * Don't use the newer version of sqlite in the dummy app --- .github/workflows/test.yml | 5 ++ Appraisals | 11 ++++ Gemfile | 2 +- gemfiles/composite_primary_keys.gemfile | 2 +- gemfiles/rails_6.0.gemfile | 2 +- gemfiles/rails_6.1.gemfile | 2 +- gemfiles/rails_7.0.gemfile | 2 +- gemfiles/rails_7.1.gemfile | 2 +- gemfiles/rails_7.2.gemfile | 2 +- gemfiles/rails_8.0.gemfile | 55 +++++++++++++++++++ rails_admin.gemspec | 2 +- spec/dummy_app/Gemfile | 2 +- spec/dummy_app/Gemfile.rails6 | 2 +- .../config/fields/types/json_spec.rb | 4 +- 14 files changed, 83 insertions(+), 12 deletions(-) create mode 100644 gemfiles/rails_8.0.gemfile diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 882f24ee8..7cb8012e4 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -58,6 +58,11 @@ jobs: orm: active_record adapter: sqlite3 asset: sprockets + - ruby: "3.3" + gemfile: gemfiles/rails_8.0.gemfile + orm: active_record + adapter: sqlite3 + asset: sprockets - ruby: "3.2" gemfile: gemfiles/composite_primary_keys.gemfile orm: active_record diff --git a/Appraisals b/Appraisals index ca42f1938..f6afa83e4 100644 --- a/Appraisals +++ b/Appraisals @@ -94,6 +94,17 @@ appraise 'rails-7.2' do gem 'importmap-rails', require: false end +appraise 'rails-8.0' do + gem 'rails', '~> 8.0.0' + gem 'importmap-rails', require: false + + group :active_record do + platforms :ruby, :mswin, :mingw, :x64_mingw do + gem 'sqlite3', '~> 2.2' + end + end +end + appraise 'composite_primary_keys' do gem 'rails', '~> 7.0.0' diff --git a/Gemfile b/Gemfile index 904083a02..0965e94b4 100644 --- a/Gemfile +++ b/Gemfile @@ -49,7 +49,7 @@ group :active_record do platforms :ruby, :mswin, :mingw, :x64_mingw do gem 'mysql2', '>= 0.3.14' gem 'pg', '>= 1.0.0' - gem 'sqlite3', '~> 1.3' + gem 'sqlite3', '>= 1.3.0' end end diff --git a/gemfiles/composite_primary_keys.gemfile b/gemfiles/composite_primary_keys.gemfile index 1ebba5c55..9bd5dd820 100644 --- a/gemfiles/composite_primary_keys.gemfile +++ b/gemfiles/composite_primary_keys.gemfile @@ -48,7 +48,7 @@ group :active_record do platforms :ruby, :mswin, :mingw, :x64_mingw do gem "mysql2", ">= 0.3.14" gem "pg", ">= 1.0.0" - gem "sqlite3", "~> 1.3" + gem "sqlite3", ">= 1.3.0" end end diff --git a/gemfiles/rails_6.0.gemfile b/gemfiles/rails_6.0.gemfile index b57ca868d..75954b32e 100644 --- a/gemfiles/rails_6.0.gemfile +++ b/gemfiles/rails_6.0.gemfile @@ -48,7 +48,7 @@ group :active_record do platforms :ruby, :mswin, :mingw, :x64_mingw do gem "mysql2", ">= 0.3.14" gem "pg", ">= 1.0.0" - gem "sqlite3", "~> 1.3" + gem "sqlite3", ">= 1.3.0" end platforms :jruby do diff --git a/gemfiles/rails_6.1.gemfile b/gemfiles/rails_6.1.gemfile index 8c4b1c44c..cdf08f0c8 100644 --- a/gemfiles/rails_6.1.gemfile +++ b/gemfiles/rails_6.1.gemfile @@ -47,7 +47,7 @@ group :active_record do platforms :ruby, :mswin, :mingw, :x64_mingw do gem "mysql2", ">= 0.3.14" gem "pg", ">= 1.0.0" - gem "sqlite3", "~> 1.3" + gem "sqlite3", ">= 1.3.0" end platforms :jruby do diff --git a/gemfiles/rails_7.0.gemfile b/gemfiles/rails_7.0.gemfile index 36f7ff8cf..2275d525a 100644 --- a/gemfiles/rails_7.0.gemfile +++ b/gemfiles/rails_7.0.gemfile @@ -48,7 +48,7 @@ group :active_record do platforms :ruby, :mswin, :mingw, :x64_mingw do gem "mysql2", ">= 0.3.14" gem "pg", ">= 1.0.0" - gem "sqlite3", "~> 1.3" + gem "sqlite3", ">= 1.3.0" end platforms :jruby do diff --git a/gemfiles/rails_7.1.gemfile b/gemfiles/rails_7.1.gemfile index 98c7769fb..b9c62f5b8 100644 --- a/gemfiles/rails_7.1.gemfile +++ b/gemfiles/rails_7.1.gemfile @@ -48,7 +48,7 @@ group :active_record do platforms :ruby, :mswin, :mingw, :x64_mingw do gem "mysql2", ">= 0.3.14" gem "pg", ">= 1.0.0" - gem "sqlite3", "~> 1.3" + gem "sqlite3", ">= 1.3.0" end end diff --git a/gemfiles/rails_7.2.gemfile b/gemfiles/rails_7.2.gemfile index f0edccff8..94dc6a1fa 100644 --- a/gemfiles/rails_7.2.gemfile +++ b/gemfiles/rails_7.2.gemfile @@ -48,7 +48,7 @@ group :active_record do platforms :ruby, :mswin, :mingw, :x64_mingw do gem "mysql2", ">= 0.3.14" gem "pg", ">= 1.0.0" - gem "sqlite3", "~> 1.3" + gem "sqlite3", ">= 1.3.0" end end diff --git a/gemfiles/rails_8.0.gemfile b/gemfiles/rails_8.0.gemfile new file mode 100644 index 000000000..6e98f9dc6 --- /dev/null +++ b/gemfiles/rails_8.0.gemfile @@ -0,0 +1,55 @@ +# This file was generated by Appraisal + +source "https://rubygems.org" + +gem "appraisal", ">= 2.0" +gem "devise", "~> 4.7" +gem "net-smtp", require: false +gem "rails", "~> 8.0.0" +gem "sassc-rails", "~> 2.1" +gem "turbo-rails" +gem "vite_rails", require: false +gem "webpacker", require: false +gem "webrick" +gem "importmap-rails", require: false + +group :development, :test do + gem "pry", ">= 0.9" +end + +group :test do + gem "cancancan", "~> 3.0" + gem "carrierwave", [">= 2.0.0.rc", "< 3"] + gem "cuprite", "!= 0.15.1" + gem "database_cleaner-active_record", ">= 2.0", require: false + gem "dragonfly", "~> 1.0" + gem "factory_bot", ">= 4.2", "!= 6.4.5" + gem "generator_spec", ">= 0.8" + gem "kt-paperclip" + gem "launchy", ">= 2.2" + gem "mini_magick", ">= 3.4" + gem "pundit" + gem "rack-cache", require: "rack/cache" + gem "rspec-expectations", "!= 3.8.3" + gem "rspec-rails", ">= 4.0.0.beta2" + gem "rspec-retry" + gem "rubocop", ["~> 1.20", "!= 1.22.2"], require: false + gem "rubocop-performance", require: false + gem "shrine", "~> 3.0" + gem "simplecov", ">= 0.9", require: false + gem "simplecov-lcov", require: false + gem "timecop", ">= 0.5" + gem "tzinfo-data", platforms: [:mingw, :mswin, :x64_mingw, :jruby] +end + +group :active_record do + gem "paper_trail", ">= 12.0" + + platforms :ruby, :mswin, :mingw, :x64_mingw do + gem "mysql2", ">= 0.3.14" + gem "pg", ">= 1.0.0" + gem "sqlite3", "~> 2.2" + end +end + +gemspec path: "../" diff --git a/rails_admin.gemspec b/rails_admin.gemspec index 1905c682f..27bc72b3d 100644 --- a/rails_admin.gemspec +++ b/rails_admin.gemspec @@ -8,7 +8,7 @@ Gem::Specification.new do |spec| spec.add_dependency 'csv' spec.add_dependency 'kaminari', '>= 0.14', '< 2.0' spec.add_dependency 'nested_form', '~> 0.3' - spec.add_dependency 'rails', ['>= 6.0', '< 8'] + spec.add_dependency 'rails', ['>= 6.0', '< 9'] spec.add_dependency 'turbo-rails', ['>= 1.0', '< 3'] spec.add_development_dependency 'bundler', '>= 1.0' spec.authors = ['Erik Michaels-Ober', 'Bogdan Gaza', 'Petteri Kaapa', 'Benoit Benezech', 'Mitsuhiro Shibuya'] diff --git a/spec/dummy_app/Gemfile b/spec/dummy_app/Gemfile index 5a16903ea..5dba7ea5f 100644 --- a/spec/dummy_app/Gemfile +++ b/spec/dummy_app/Gemfile @@ -14,7 +14,7 @@ group :active_record do platforms :ruby, :mswin, :mingw do gem 'mysql2', '>= 0.3.14' gem 'pg', '>= 0.14' - gem 'sqlite3', '~> 1.3' + gem 'sqlite3', '>= 1.3.0' end gem 'paper_trail', '>= 12.0' diff --git a/spec/dummy_app/Gemfile.rails6 b/spec/dummy_app/Gemfile.rails6 index 260b684c1..5b5c84534 100644 --- a/spec/dummy_app/Gemfile.rails6 +++ b/spec/dummy_app/Gemfile.rails6 @@ -13,7 +13,7 @@ group :active_record do platforms :ruby, :mswin, :mingw do gem 'mysql2', '>= 0.3.14' gem 'pg', '>= 0.14' - gem 'sqlite3', '>= 1.3.0' + gem 'sqlite3', '~> 2.2' end gem 'paper_trail', '>= 12.0' diff --git a/spec/rails_admin/config/fields/types/json_spec.rb b/spec/rails_admin/config/fields/types/json_spec.rb index a1e039582..a749d9302 100644 --- a/spec/rails_admin/config/fields/types/json_spec.rb +++ b/spec/rails_admin/config/fields/types/json_spec.rb @@ -24,7 +24,7 @@ it 'returns correct value for empty json' do allow(object).to receive(:json_field) { {} } actual = field.with(bindings).formatted_value - expect(actual).to match(/{\n+}/) + expect(actual).to match(/{\n*}/) end it 'retuns correct value' do @@ -72,7 +72,7 @@ it 'returns correct value for empty json' do allow(object).to receive(:json_field) { {} } actual = field.with(bindings).export_value - expect(actual).to match(/{\n+}/) + expect(actual).to match(/{\n*}/) end it 'returns correct value' do From e38c12d98e3e11b858d2f3caa752013b7478f926 Mon Sep 17 00:00:00 2001 From: Mitsuhiro Shibuya Date: Sat, 23 Nov 2024 17:42:29 +0900 Subject: [PATCH 6/7] Follow-up for #3702 - Fix Rails 7.0/7.1 builds - Remove spec/dummy_app/Gemfile.rails6, as it's not used much --- Appraisals | 20 +++++++--- gemfiles/composite_primary_keys.gemfile | 2 +- gemfiles/rails_7.0.gemfile | 2 +- gemfiles/rails_7.1.gemfile | 2 +- gemfiles/rails_8.0.gemfile | 2 +- spec/dummy_app/Gemfile | 2 +- spec/dummy_app/Gemfile.rails6 | 49 ------------------------- 7 files changed, 19 insertions(+), 60 deletions(-) delete mode 100644 spec/dummy_app/Gemfile.rails6 diff --git a/Appraisals b/Appraisals index f6afa83e4..112766ead 100644 --- a/Appraisals +++ b/Appraisals @@ -56,6 +56,10 @@ appraise 'rails-7.0' do gem 'importmap-rails', require: false group :active_record do + platforms :ruby, :mswin, :mingw, :x64_mingw do + gem 'sqlite3', '~> 1.3' + end + platforms :jruby do gem 'activerecord-jdbcmysql-adapter', '~> 70.0' gem 'activerecord-jdbcpostgresql-adapter', '~> 70.0' @@ -78,6 +82,12 @@ appraise 'rails-7.1' do gem 'rails', '~> 7.1.0' gem 'importmap-rails', require: false + group :active_record do + platforms :ruby, :mswin, :mingw, :x64_mingw do + gem 'sqlite3', '~> 1.3' + end + end + group :mongoid do gem 'cancancan-mongoid' gem 'carrierwave-mongoid', '>= 0.6.3', require: 'carrierwave/mongoid' @@ -97,12 +107,6 @@ end appraise 'rails-8.0' do gem 'rails', '~> 8.0.0' gem 'importmap-rails', require: false - - group :active_record do - platforms :ruby, :mswin, :mingw, :x64_mingw do - gem 'sqlite3', '~> 2.2' - end - end end appraise 'composite_primary_keys' do @@ -110,5 +114,9 @@ appraise 'composite_primary_keys' do group :active_record do gem 'composite_primary_keys' + + platforms :ruby, :mswin, :mingw, :x64_mingw do + gem 'sqlite3', '~> 1.3' + end end end diff --git a/gemfiles/composite_primary_keys.gemfile b/gemfiles/composite_primary_keys.gemfile index 9bd5dd820..1ebba5c55 100644 --- a/gemfiles/composite_primary_keys.gemfile +++ b/gemfiles/composite_primary_keys.gemfile @@ -48,7 +48,7 @@ group :active_record do platforms :ruby, :mswin, :mingw, :x64_mingw do gem "mysql2", ">= 0.3.14" gem "pg", ">= 1.0.0" - gem "sqlite3", ">= 1.3.0" + gem "sqlite3", "~> 1.3" end end diff --git a/gemfiles/rails_7.0.gemfile b/gemfiles/rails_7.0.gemfile index 2275d525a..36f7ff8cf 100644 --- a/gemfiles/rails_7.0.gemfile +++ b/gemfiles/rails_7.0.gemfile @@ -48,7 +48,7 @@ group :active_record do platforms :ruby, :mswin, :mingw, :x64_mingw do gem "mysql2", ">= 0.3.14" gem "pg", ">= 1.0.0" - gem "sqlite3", ">= 1.3.0" + gem "sqlite3", "~> 1.3" end platforms :jruby do diff --git a/gemfiles/rails_7.1.gemfile b/gemfiles/rails_7.1.gemfile index b9c62f5b8..98c7769fb 100644 --- a/gemfiles/rails_7.1.gemfile +++ b/gemfiles/rails_7.1.gemfile @@ -48,7 +48,7 @@ group :active_record do platforms :ruby, :mswin, :mingw, :x64_mingw do gem "mysql2", ">= 0.3.14" gem "pg", ">= 1.0.0" - gem "sqlite3", ">= 1.3.0" + gem "sqlite3", "~> 1.3" end end diff --git a/gemfiles/rails_8.0.gemfile b/gemfiles/rails_8.0.gemfile index 6e98f9dc6..873be4570 100644 --- a/gemfiles/rails_8.0.gemfile +++ b/gemfiles/rails_8.0.gemfile @@ -48,7 +48,7 @@ group :active_record do platforms :ruby, :mswin, :mingw, :x64_mingw do gem "mysql2", ">= 0.3.14" gem "pg", ">= 1.0.0" - gem "sqlite3", "~> 2.2" + gem "sqlite3", ">= 1.3.0" end end diff --git a/spec/dummy_app/Gemfile b/spec/dummy_app/Gemfile index 5dba7ea5f..f8c3ec1df 100644 --- a/spec/dummy_app/Gemfile +++ b/spec/dummy_app/Gemfile @@ -26,7 +26,7 @@ gem 'devise', '>= 3.2' gem 'dragonfly', '~> 1.0' gem 'importmap-rails', require: false gem 'mini_magick', '>= 3.4' -gem 'mlb', '>= 0.7', github: 'mshibuya/mlb', branch: 'ruby-3' +gem 'mlb', '>= 0.7' gem 'paperclip', '>= 3.4' gem 'rails_admin', path: '../../' gem 'shrine', '~> 3.0' diff --git a/spec/dummy_app/Gemfile.rails6 b/spec/dummy_app/Gemfile.rails6 deleted file mode 100644 index 5b5c84534..000000000 --- a/spec/dummy_app/Gemfile.rails6 +++ /dev/null @@ -1,49 +0,0 @@ -source 'https://rubygems.org' - -gem 'rails', '>= 6.0.0' -gem 'webpacker', require: false - -group :active_record do - platforms :jruby do - gem 'activerecord-jdbcmysql-adapter', '>= 1.2' - gem 'activerecord-jdbcpostgresql-adapter', '>= 1.2' - gem 'activerecord-jdbcsqlite3-adapter', '>= 1.2' - end - - platforms :ruby, :mswin, :mingw do - gem 'mysql2', '>= 0.3.14' - gem 'pg', '>= 0.14' - gem 'sqlite3', '~> 2.2' - end - - gem 'paper_trail', '>= 12.0' -end - -group :mongoid do - gem 'carrierwave-mongoid', '>= 0.6.3', require: 'carrierwave/mongoid' - gem 'kaminari-mongoid' - gem 'mongoid', ['>= 6.0', '< 8'] - gem 'mongoid-paperclip', '>= 0.0.8', require: 'mongoid_paperclip' - gem 'shrine-mongoid', '~> 1.0' -end - -gem 'carrierwave', '>= 2.0.0.rc', '< 3.0' -gem 'devise', '>= 3.2' -gem 'dragonfly', '~> 1.0' -gem 'mini_magick', '>= 3.4' -gem 'mlb', '>= 0.7', github: 'mshibuya/mlb', branch: 'ruby-3' -gem 'paperclip', '>= 3.4' -gem 'rails_admin', path: '../../' -gem 'shrine', '~> 3.0' -gem 'webrick' - -# Gems used only for assets and not required -# in production environments by default. -group :assets do - gem 'sassc-rails', '~> 2.1' - - # See https://github.com/sstephenson/execjs#readme for more supported runtimes - # gem 'therubyracer' - - gem 'uglifier', '>= 1.3' -end From f4cf4b6c9fd1729357b7be0b6587d0d0c706dbb3 Mon Sep 17 00:00:00 2001 From: Mitsuhiro Shibuya Date: Sun, 8 Dec 2024 15:18:29 +0900 Subject: [PATCH 7/7] Version 3.3.0 --- CHANGELOG.md | 10 +++++++++- lib/rails_admin/version.rb | 4 ++-- package.json | 2 +- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fb7e5bfe7..73908df70 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,15 @@ ## [Unreleased](https://github.com/railsadminteam/rails_admin/tree/HEAD) -[Full Changelog](https://github.com/railsadminteam/rails_admin/compare/v3.2.1...HEAD) +[Full Changelog](https://github.com/railsadminteam/rails_admin/compare/v3.3.0...HEAD) + +## [3.3.0](https://github.com/railsadminteam/rails_admin/tree/v3.3.0) - 2024-12-08 + +[Full Changelog](https://github.com/railsadminteam/rails_admin/compare/v3.2.1...v3.3.0) + +### Added + +- Rails 8.0 support ([#3702](https://github.com/railsadminteam/rails_admin/pull/3702)) ## [3.2.1](https://github.com/railsadminteam/rails_admin/tree/v3.2.0) - 2024-10-10 diff --git a/lib/rails_admin/version.rb b/lib/rails_admin/version.rb index f0c989f0b..6d0a8c5ce 100644 --- a/lib/rails_admin/version.rb +++ b/lib/rails_admin/version.rb @@ -3,8 +3,8 @@ module RailsAdmin class Version MAJOR = 3 - MINOR = 2 - PATCH = 1 + MINOR = 3 + PATCH = 0 PRE = nil class << self diff --git a/package.json b/package.json index 7a5e2b108..d60008df5 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "rails_admin", - "version": "3.2.1", + "version": "3.3.0", "description": "RailsAdmin is a Rails engine that provides an easy-to-use interface for managing your data.", "homepage": "https://github.com/railsadminteam/rails_admin", "license": "MIT",