3 0 stable

.github/workflows/bug-report-template.yml

@@ -15,7 +15,7 @@ concurrency:
   cancel-in-progress: ${{ github.event_name == 'pull_request' }}
 
 env:
-  RUBY_VERSION: ruby-3.2
+  RUBY_VERSION: ruby-3.3
 
 jobs:
   bug_report_template_test:
@@ -24,7 +24,7 @@ jobs:
     if: ${{ github.event_name == 'pull_request' || github.repository_owner == 'activeadmin' }}
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ env.RUBY_VERSION }}

.github/workflows/ci.yaml

@@ -19,37 +19,55 @@ jobs:
       fail-fast: false
       matrix:
         ruby:
+          - 3.4
+          - 3.3
           - 3.2
           - 3.1
-          - '3.0'
         os:
           - ubuntu-latest
         deps:
-          - rails_61
-          - rails_70
+          - rails_80
+          - rails_72
           - rails_71
+          - rails_70
+          - rails_61
+        include:
+          - ruby: '3.0'
+            os: ubuntu-latest
+            deps: rails_61
+        exclude:
+          - ruby: '3.1'
+            os: ubuntu-latest
+            deps: rails_80
+          - ruby: '3.4'
+            os: ubuntu-latest
+            deps: rails_61
+          - ruby: '3.4'
+            os: ubuntu-latest
+            deps: rails_70
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Configure bundler (default)
         run: |
           echo "BUNDLE_GEMFILE=Gemfile" >> "$GITHUB_ENV"
-        if: matrix.deps == 'rails_71'
+        if: matrix.deps == 'rails_80'
       - name: Configure bundler (alternative)
         run: |
           echo "BUNDLE_GEMFILE=gemfiles/${{ matrix.deps }}/Gemfile" >> "$GITHUB_ENV"
-        if: matrix.deps != 'rails_71'
+        if: matrix.deps != 'rails_80'
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
           bundler-cache: true
+          rubygems: latest
       - name: Setup git for test app setup
         run: |
           git config --global user.email [email protected]
           git config --global user.name ActiveAdmin
       - name: Create test app
         run: bin/rake setup
       - name: Restore cached RSpec runtimes
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: tmp/parallel_runtime_rspec.log
           key: runtimes-rspec-${{ matrix.ruby }}-${{ matrix.deps }}-${{ hashFiles('tmp/parallel_runtime_rspec.log') }}
@@ -60,7 +78,7 @@ jobs:
           bin/parallel_rspec
           RSPEC_FILESYSTEM_CHANGES=true bin/rspec
       - name: Restore cached cucumber runtimes
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: tmp/parallel_runtime_cucumber.log
           key: runtimes-cucumber-${{ matrix.ruby }}-${{ matrix.deps }}-${{ hashFiles('tmp/parallel_runtime_cucumber.log') }}
@@ -71,9 +89,11 @@ jobs:
           bin/parallel_cucumber --fail-fast
           bin/cucumber --profile filesystem-changes
           bin/cucumber --profile class-reloading
-      - uses: actions/upload-artifact@v3
+      - name: Rename coverage file by matrix run
+        run: mv coverage/coverage.xml coverage/coverage-ruby-${{ matrix.ruby }}-${{ matrix.deps }}.xml
+      - uses: actions/upload-artifact@v4
         with:
-          name: coverage
+          name: coverage-ruby-${{ matrix.ruby }}-${{ matrix.deps }}
           path: coverage
           if-no-files-found: error
 
@@ -82,12 +102,14 @@ jobs:
     runs-on: ubuntu-latest
     needs: [test]
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/download-artifact@v3
+      - uses: actions/checkout@v4
+      - uses: actions/download-artifact@v4
         with:
-          name: coverage
           path: coverage
-      - uses: codecov/codecov-action@v3
+          pattern: coverage-ruby-*
+          merge-multiple: true
+      - uses: codecov/codecov-action@v4
         with:
+          token: ${{ secrets.CODECOV_TOKEN }}
           directory: coverage
           fail_ci_if_error: true

.github/workflows/gherkin-lint.yml

@@ -18,8 +18,8 @@ jobs:
     name: Run gherkin-lint
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
           node-version: ${{ env.NODE_VERSION }}
           cache: 'yarn'

.github/workflows/lint.yml

@@ -4,14 +4,14 @@ on:
   pull_request:
 
 env:
-  RUBY_VERSION: 3.2
+  RUBY_VERSION: 3.3
 
 jobs:
   lint:
     name: lint
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ env.RUBY_VERSION }}

CHANGELOG.md

@@ -2,6 +2,72 @@
 
 ## Unreleased
 
+## 3.3.0 [☰](https://github.com/activeadmin/activeadmin/compare/v3.2.5..v3.3.0)
+
+### Enhancements
+
+* Improve v3 docs regarding compatibility with vite_rails [#8548] by [@mattbrictson]
+* Backport test against Rails 8.0 [#8556] by [@mgrunberg] and [@tagliala]
+* Test against Ruby 3.4 [#8614] by [@tagliala]
+* Backport Support sortable argument in id_column [#8650] by [@jaynetics]
+* Backport Support title for id_column [#8652] by [@mgrunberg]
+
+### Bug Fixes
+
+* Backport Fix attributes passed to form has_many not being set on new record form items [#8551] by [@Fs00]
+* Backport Fix deprecation warning in Ruby 3.4 [#8596] by [@tagliala]
+* Backport Fix circular require warning in belongs_to.rb [#8601] by [@tagliala]
+
+## 3.2.5 [☰](https://github.com/activeadmin/activeadmin/compare/v3.2.4..v3.2.5)
+
+### Enhancements
+
+* Backport Add favicon to template app to fix Rails 7.2 test suite run [#8468] by [@mgrunberg]
+* Backport Use attribute_types instead of columns_hash to determine type [#8469] by [@mgrunberg]
+* Backport Optimize count query for pagination_total: false option [#8470] by [@mgrunberg]
+
+### Bug Fixes
+
+* Restore inner span tag to form inputs legend [#8467] by [@denisahearn]
+
+## 3.2.4 [☰](https://github.com/activeadmin/activeadmin/compare/v3.2.3..v3.2.4)
+
+### Enhancements
+
+* Test against Rails 7.2 [#8434] by [@mgrunberg]
+
+### Bug Fixes
+
+* Backport Improve form f.inputs attributes rendering [#8446] by [@amiel]
+
+## 3.2.3 [☰](https://github.com/activeadmin/activeadmin/compare/v3.2.2..v3.2.3)
+
+### Enhancements
+
+* Backport better implementation of counter-cache-column check [#8412] by [@plashchynski]
+
+### Bug Fixes
+
+* Remove deprecation warnings when building with dart sass >= 1.77.7 [#8405] by [@mgrunberg]
+
+## 3.2.2 [☰](https://github.com/activeadmin/activeadmin/compare/v3.2.1..v3.2.2)
+
+### Security Fixes
+
+* Backport Fix potential XSS issue when rendering form legends [#8349] by
+  [@deivid-rodriguez]
+
+### Enhancements
+
+* Update vendored jQuery UI to 1.13.3 [#8329] by [@tagliala]
+
+## 3.2.1 [☰](https://github.com/activeadmin/activeadmin/compare/v3.2.0..v3.2.1)
+
+### Enhancements
+
+* Backport Suppress ruby 3.3 warning [#8310] by [@mgrunberg]
+* Backport Recommend using target="_blank" instead of target="blank" [#8311] by [@mgrunberg]
+
 ## 3.2.0 [☰](https://github.com/activeadmin/activeadmin/compare/v3.1.0..v3.2.0)
 
 ### Security Fixes
@@ -898,6 +964,26 @@ Please check [0-6-stable] for previous changes.
 [#8165]: https://github.com/activeadmin/activeadmin/pull/8165
 [#8166]: https://github.com/activeadmin/activeadmin/pull/8166
 [#8167]: https://github.com/activeadmin/activeadmin/pull/8167
+[#8310]: https://github.com/activeadmin/activeadmin/pull/8310
+[#8311]: https://github.com/activeadmin/activeadmin/pull/8311
+[#8329]: https://github.com/activeadmin/activeadmin/pull/8329
+[#8349]: https://github.com/activeadmin/activeadmin/pull/8349
+[#8405]: https://github.com/activeadmin/activeadmin/pull/8405
+[#8412]: https://github.com/activeadmin/activeadmin/pull/8412
+[#8434]: https://github.com/activeadmin/activeadmin/pull/8434
+[#8446]: https://github.com/activeadmin/activeadmin/pull/8446
+[#8467]: https://github.com/activeadmin/activeadmin/pull/8467
+[#8468]: https://github.com/activeadmin/activeadmin/pull/8468
+[#8469]: https://github.com/activeadmin/activeadmin/pull/8469
+[#8470]: https://github.com/activeadmin/activeadmin/pull/8470
+[#8548]: https://github.com/activeadmin/activeadmin/pull/8548
+[#8551]: https://github.com/activeadmin/activeadmin/pull/8551
+[#8556]: https://github.com/activeadmin/activeadmin/pull/8556
+[#8596]: https://github.com/activeadmin/activeadmin/pull/8596
+[#8601]: https://github.com/activeadmin/activeadmin/pull/8601
+[#8614]: https://github.com/activeadmin/activeadmin/pull/8614
+[#8650]: https://github.com/activeadmin/activeadmin/pull/8650
+[#8652]: https://github.com/activeadmin/activeadmin/pull/8652
 
 [@1000ship]: https://github.com/1000ship
 [@5t111111]: https://github.com/5t111111
@@ -926,6 +1012,7 @@ Please check [0-6-stable] for previous changes.
 [@craigmcnamara]: https://github.com/craigmcnamara
 [@DanielHeath]: https://github.com/DanielHeath
 [@deivid-rodriguez]: https://github.com/deivid-rodriguez
+[@denisahearn]: https://github.com/denisahearn
 [@dennisvdvliet]: https://github.com/dennisvdvliet
 [@dhyegofernando]: https://github.com/dhyegofernando
 [@dkniffin]: https://github.com/dkniffin
@@ -977,6 +1064,7 @@ Please check [0-6-stable] for previous changes.
 [@Looooong]: https://github.com/Looooong
 [@lubosch]: https://github.com/lubosch
 [@markstory]: https://github.com/markstory
+[@mattbrictson]: https://github.com/mattbrictson
 [@mauriciopasquier]: https://github.com/mauriciopasquier
 [@mconiglio]: https://github.com/mconiglio
 [@mgrunberg]: https://github.com/mgrunberg
@@ -992,6 +1080,7 @@ Please check [0-6-stable] for previous changes.
 [@orkhan]: https://github.com/orkhan
 [@panasyuk]: https://github.com/panasyuk
 [@PChambino]: https://github.com/PChambino
+[@plashchynski]: https://github.com/plashchynski
 [@potatosalad]: https://github.com/potatosalad
 [@pranas]: https://github.com/pranas
 [@ray-curran]: https://github.com/ray-curran

Gemfile

@@ -10,11 +10,11 @@ group :development, :test do
   gem "draper"
   gem "devise"
 
-  gem "rails", "~> 7.1.0"
+  gem "rails", "~> 8.0.0"
 
   gem "sprockets-rails"
   gem "sassc-rails"
-  gem "ransack", ">= 4.1.0"
+  gem "ransack", ">= 4.2.0"
   gem "formtastic", ">= 5.0.0"
 end
 
@@ -25,9 +25,9 @@ group :test do
 
   gem "simplecov", require: false # Test coverage generator. Go to /coverage/ after running tests
   gem "simplecov-cobertura", require: false
-  gem "cucumber-rails", require: false, github: "cucumber/cucumber-rails", branch: "main"
+  gem "cucumber-rails", require: false
   gem "cucumber"
-  gem "database_cleaner"
+  gem "database_cleaner-active_record"
   gem "launchy"
   gem "parallel_tests"
   gem "rspec-rails"