Merge branch 'main' into 4.8.1-mixins

Author: johnnyshields

.devcontainer/devcontainer.json

@@ -0,0 +1,25 @@
+// For format details, see https://aka.ms/devcontainer.json. For config options, see the
+// README at: https://github.com/devcontainers/templates/tree/main/src/ruby
+{
+	"name": "Ruby",
+	// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
+	"image": "mcr.microsoft.com/devcontainers/ruby:0-3-bullseye",
+	"features": {
+		"ghcr.io/devcontainers/features/github-cli:1": {}
+	},
+
+	// Features to add to the dev container. More info: https://containers.dev/features.
+	// "features": {},
+
+	// Use 'forwardPorts' to make a list of ports inside the container available locally.
+	// "forwardPorts": [],
+
+	// Use 'postCreateCommand' to run commands after the container is created.
+	"postCreateCommand": "bundle install",
+
+	// Configure tool-specific properties.
+	// "customizations": {},
+
+	// Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
+	// "remoteUser": "root"
+}

.github/dependabot.yml

@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"

.github/workflows/test.yml

@@ -8,142 +8,48 @@ jobs:
         gemfile:
           - Gemfile
           - gemfiles/Gemfile-rails-main
+          - gemfiles/Gemfile-rails-7-0
           - gemfiles/Gemfile-rails-6-1
           - gemfiles/Gemfile-rails-6-0
-          - gemfiles/Gemfile-rails-5-2
-          - gemfiles/Gemfile-rails-5-1
-          - gemfiles/Gemfile-rails-5-0
-          - gemfiles/Gemfile-rails-4-2
-          - gemfiles/Gemfile-rails-4-1
         ruby:
+          - '3.3'
+          - '3.2'
           - '3.1'
           - '3.0'
           - '2.7'
-          - '2.6'
-          - '2.5'
-          - '2.4'
-          - '2.3'
-          - '2.2'
-          - '2.1'
         env:
           - DEVISE_ORM=active_record
           - DEVISE_ORM=mongoid
         exclude:
-          - gemfile: Gemfile
-            ruby: '2.6'
-          - gemfile: Gemfile
-            ruby: '2.5'
-          - gemfile: Gemfile
-            ruby: '2.4'
-          - gemfile: Gemfile
-            ruby: '2.3'
-          - gemfile: Gemfile
-            ruby: '2.2'
-          - gemfile: Gemfile
-            ruby: '2.1'
-          - gemfile: Gemfile
-            env: DEVISE_ORM=mongoid
           - gemfile: gemfiles/Gemfile-rails-main
-            ruby: '2.6'
+            ruby: '2.7' # Rails > 7.1 supports Ruby >= 3.1
           - gemfile: gemfiles/Gemfile-rails-main
-            ruby: '2.5'
+            ruby: '3.0' # Rails > 7.1 supports Ruby >= 3.1
           - gemfile: gemfiles/Gemfile-rails-main
-            ruby: '2.4'
-          - gemfile: gemfiles/Gemfile-rails-main
-            ruby: '2.3'
-          - gemfile: gemfiles/Gemfile-rails-main
-            ruby: '2.2'
-          - gemfile: gemfiles/Gemfile-rails-main
-            ruby: '2.1'
+            ruby: '3.1' # Rails >= 8.0 supports Ruby >= 3.2
+          - gemfile: Gemfile
+            env: DEVISE_ORM=mongoid
           - gemfile: gemfiles/Gemfile-rails-main
             env: DEVISE_ORM=mongoid
-          - gemfile: gemfiles/Gemfile-rails-6-1
-            ruby: '2.4'
-          - gemfile: gemfiles/Gemfile-rails-6-1
-            ruby: '2.3'
-          - gemfile: gemfiles/Gemfile-rails-6-1
-            ruby: '2.2'
-          - gemfile: gemfiles/Gemfile-rails-6-1
-            ruby: '2.1'
+          - gemfile: gemfiles/Gemfile-rails-7-0
+            env: DEVISE_ORM=mongoid
           - gemfile: gemfiles/Gemfile-rails-6-1
             env: DEVISE_ORM=mongoid
           - gemfile: gemfiles/Gemfile-rails-6-0
-            ruby: '3.1'
-          - gemfile: gemfiles/Gemfile-rails-6-0
-            ruby: '2.4'
+            ruby: '3.2'
           - gemfile: gemfiles/Gemfile-rails-6-0
-            ruby: '2.3'
-          - gemfile: gemfiles/Gemfile-rails-6-0
-            ruby: '2.2'
-          - gemfile: gemfiles/Gemfile-rails-6-0
-            ruby: '2.1'
-          - gemfile: gemfiles/Gemfile-rails-6-0
-            env: DEVISE_ORM=mongoid
-          - gemfile: gemfiles/Gemfile-rails-5-2
             ruby: '3.1'
-          - gemfile: gemfiles/Gemfile-rails-5-2
-            ruby: '3.0'
-          - gemfile: gemfiles/Gemfile-rails-5-2
-            ruby: '2.7'
-          - gemfile: gemfiles/Gemfile-rails-5-2
-            ruby: '2.2'
-          - gemfile: gemfiles/Gemfile-rails-5-2
-            ruby: '2.1'
-          - gemfile: gemfiles/Gemfile-rails-5-2
-            env: DEVISE_ORM=mongoid
-          - gemfile: gemfiles/Gemfile-rails-5-1
-            ruby: '3.1'
-          - gemfile: gemfiles/Gemfile-rails-5-1
-            ruby: '3.0'
-          - gemfile: gemfiles/Gemfile-rails-5-1
-            ruby: '2.7'
-          - gemfile: gemfiles/Gemfile-rails-5-1
-            ruby: '2.1'
-          - gemfile: gemfiles/Gemfile-rails-5-1
-            env: DEVISE_ORM=mongoid
-          - gemfile: gemfiles/Gemfile-rails-5-0
-            ruby: '3.1'
-          - gemfile: gemfiles/Gemfile-rails-5-0
-            ruby: '3.0'
-          - gemfile: gemfiles/Gemfile-rails-5-0
-            ruby: '2.7'
-          - gemfile: gemfiles/Gemfile-rails-5-0
-            ruby: '2.1'
-          - gemfile: gemfiles/Gemfile-rails-5-0
+          - gemfile: gemfiles/Gemfile-rails-6-0
             env: DEVISE_ORM=mongoid
-          - gemfile: gemfiles/Gemfile-rails-4-2
-            ruby: '3.1'
-          - gemfile: gemfiles/Gemfile-rails-4-2
-            ruby: '3.0'
-          - gemfile: gemfiles/Gemfile-rails-4-2
-            ruby: '2.7'
-          - gemfile: gemfiles/Gemfile-rails-4-2
-            ruby: '2.6'
-          - gemfile: gemfiles/Gemfile-rails-4-1
-            ruby: '3.1'
-          - gemfile: gemfiles/Gemfile-rails-4-1
-            ruby: '3.0'
-          - gemfile: gemfiles/Gemfile-rails-4-1
-            ruby: '2.7'
-          - gemfile: gemfiles/Gemfile-rails-4-1
-            ruby: '2.6'
-          - gemfile: gemfiles/Gemfile-rails-4-1
-            ruby: '2.5'
-          - gemfile: gemfiles/Gemfile-rails-4-1
-            ruby: '2.4'
     runs-on: ubuntu-latest
     env: # $BUNDLE_GEMFILE must be set at the job level, so it is set for all steps
       BUNDLE_GEMFILE: ${{ matrix.gemfile }}
     steps:
-      - uses: actions/checkout@v2
-      - name: Setup Bundler 1.x for Rails 4.x
-        if: ${{ matrix.gemfile == 'gemfiles/Gemfile-rails-4-1' || matrix.gemfile == 'gemfiles/Gemfile-rails-4-2' }}
-        run: echo "BUNDLER_VERSION=1.17.3" >> $GITHUB_ENV
+      - uses: actions/checkout@v3
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
           bundler-cache: true # runs bundle install and caches installed gems automatically
-          bundler: ${{ env.BUNDLER_VERSION || 'latest' }}
-      - uses: supercharge/mongodb-github-action@1.3.0
+      - uses: supercharge/mongodb-github-action@1.9.0
         if: ${{ matrix.env == 'DEVISE_ORM=mongoid' }}
       - run: bundle exec rake