Merge branch 'master' into bump-activerecord-import

Fivell · web-flow · commit 380fdd086abe · 2026-04-08T09:09:42.000+02:00
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -11,8 +11,11 @@ jobs:
       fail-fast: false
       matrix:
         ruby: ['3.2', '3.3', '3.4']
-        rails: ['7.1.0', '7.2.0']
+        rails: ['7.1.0', '7.2.0', '8.0.0']
         activeadmin: ['3.2.0', '3.3.0', '3.4.0', '3.5.1']
+        exclude:
+          - rails: '8.0.0'
+            activeadmin: '3.2.0'
     env:
       RAILS: ${{ matrix.rails }}
       AA: ${{ matrix.activeadmin }}
diff --git a/spec/support/rails_template.rb b/spec/support/rails_template.rb
@@ -1,3 +1,5 @@
+create_file "app/assets/config/manifest.js", skip: true
+
 generate :model, 'author name:string{10}:uniq last_name:string birthday:date --force'
 generate :model, 'post title:string:uniq body:text author:references --force'
 

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+create_file "app/assets/config/manifest.js", skip: true`
	`2`	`+`
`1`	`3`	`generate :model, 'author name:string{10}:uniq last_name:string birthday:date --force'`
`2`	`4`	`generate :model, 'post title:string:uniq body:text author:references --force'`
`3`	`5`