Merge branch 'main' into feature/delegated-type-types-introspection

Author: jprosevear

.github/workflows/lint.yml

@@ -14,6 +14,9 @@ jobs:
     steps:
     - uses: actions/checkout@v4
 
+    - name: Remove Gemfile.lock
+      run: rm -f Gemfile.lock
+
     - name: Set up Ruby 3.3
       uses: ruby/setup-ruby@v1
       with:
@@ -23,18 +26,6 @@ jobs:
     - name: mdl
       run: bundle exec rake -f guides/Rakefile guides:lint
 
-    - name: Set up Python
-      uses: actions/setup-python@v3
-      with:
-        python-version: "3.10"
-
-    - name: Install dependencies
-      run: |
-        python -m pip install --upgrade pip
-        pip install codespell==2.1.0
-    - name: Check spelling with codespell
-      run: codespell --ignore-words=codespell.txt --skip="./vendor/bundle,./actiontext/app/assets/javascripts/trix.js,./yarn.lock" || exit 1
-
     - run: tools/railspect changelogs .
     - run: tools/railspect configuration .
 

.github/workflows/rail_inspector.yml

@@ -17,6 +17,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
+      - name: Remove Gemfile.lock
+        run: rm -f Gemfile.lock
       - name: Set up Ruby 3.3
         uses: ruby/setup-ruby@v1
         with:

.github/workflows/rails-new-docker.yml

@@ -15,6 +15,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
+    - name: Remove Gemfile.lock
+      run: rm -f Gemfile.lock
     - name: Set up Ruby 3.3
       uses: ruby/setup-ruby@v1
       with:

Gemfile.lock

@@ -32,19 +32,13 @@ PATH
       activerecord (= 7.2.0.alpha)
       activestorage (= 7.2.0.alpha)
       activesupport (= 7.2.0.alpha)
-      mail (>= 2.7.1)
-      net-imap
-      net-pop
-      net-smtp
+      mail (>= 2.8.0)
     actionmailer (7.2.0.alpha)
       actionpack (= 7.2.0.alpha)
       actionview (= 7.2.0.alpha)
       activejob (= 7.2.0.alpha)
       activesupport (= 7.2.0.alpha)
-      mail (~> 2.5, >= 2.5.4)
-      net-imap
-      net-pop
-      net-smtp
+      mail (>= 2.8.0)
       rails-dom-testing (~> 2.2)
     actionpack (7.2.0.alpha)
       actionview (= 7.2.0.alpha)
@@ -333,7 +327,7 @@ GEM
     mini_magick (4.12.0)
     mini_mime (1.1.5)
     mini_portile2 (2.8.5)
-    minitest (5.20.0)
+    minitest (5.21.1)
     minitest-bisect (1.7.0)
       minitest-server (~> 1.0)
       path_expander (~> 1.1)
@@ -677,4 +671,4 @@ DEPENDENCIES
   websocket-client-simple!
 
 BUNDLED WITH
-   2.3.22
+   2.5.4

actionmailbox/actionmailbox.gemspec

@@ -38,8 +38,5 @@ Gem::Specification.new do |s|
   s.add_dependency "activejob",     version
   s.add_dependency "actionpack",    version
 
-  s.add_dependency "mail", ">= 2.7.1"
-  s.add_dependency "net-imap"
-  s.add_dependency "net-pop"
-  s.add_dependency "net-smtp"
+  s.add_dependency "mail", ">= 2.8.0"
 end

actionmailer/actionmailer.gemspec

@@ -38,9 +38,6 @@ Gem::Specification.new do |s|
   s.add_dependency "actionview", version
   s.add_dependency "activejob", version
 
-  s.add_dependency "mail", ["~> 2.5", ">= 2.5.4"]
-  s.add_dependency "net-imap"
-  s.add_dependency "net-pop"
-  s.add_dependency "net-smtp"
+  s.add_dependency "mail", ">= 2.8.0"
   s.add_dependency "rails-dom-testing", "~> 2.2"
 end

actionmailer/lib/action_mailer/delivery_methods.rb

@@ -32,8 +32,7 @@ module DeliveryMethods
 
       add_delivery_method :sendmail, Mail::Sendmail,
         location:  "/usr/sbin/sendmail",
-        # See breaking change in the mail gem - https://github.com/mikel/mail/commit/7e1196bd29815a0901d7290c82a332c0959b163a
-        arguments: Gem::Version.new(Mail::VERSION.version) >= Gem::Version.new("2.8.0") ? %w[-i] : "-i"
+        arguments: %w[-i]
 
       add_delivery_method :test, Mail::TestMailer
     end

actionpack/test/controller/chunked_test.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+require "stringio"
+require "abstract_unit"
+
+class ChunkedTest < ActionDispatch::IntegrationTest
+  class ChunkedController < ApplicationController
+    def chunk
+      render json: {
+        raw_post: request.raw_post,
+        content_length: request.content_length
+      }
+    end
+  end
+
+  # The TestInput class prevents Rack::MockRequest from adding a Content-Length when the method `size` is defined
+  class TestInput < StringIO
+    undef_method :size
+  end
+
+  test "parses request raw_post correctly when request has Transfer-Encoding header without a Content-Length value" do
+    @app = self.class.build_app
+    @app.routes.draw do
+      post "chunked", to: ChunkedController.action(:chunk)
+    end
+
+    post "/chunked", params: TestInput.new("foo=bar"), headers: { "Transfer-Encoding" => "gzip, chunked;foo=bar" }
+
+    assert_equal 7, response.parsed_body["content_length"]
+    assert_equal "foo=bar", response.parsed_body["raw_post"]
+  end
+end

actionview/CHANGELOG.md

@@ -1,3 +1,7 @@
+*   Raise `ArgumentError` if `:renderable` object does not respond to `#render_in`
+
+    *Sean Doyle*
+
 *   Add the `nonce: true` option for `stylesheet_link_tag` helper to support automatic nonce generation for Content Security Policy.
     Works the same way as `javascript_include_tag nonce: true` does.
 
@@ -7,7 +11,9 @@
 
     *Sean Doyle*
 
-*   Rename `ActionView::TestCase::Behavior::{Content,RenderedViewContent}`
+*   Rename `ActionView::TestCase::Behavior::Content` to `ActionView::TestCase::Behavior::RenderedViewContent`
+
+    Make `RenderedViewContent` inherit from `String`. Make private API with `:nodoc:`
 
     *Sean Doyle*
 

actionview/lib/action_view/renderer/abstract_renderer.rb

@@ -79,7 +79,7 @@ def partial_path(object, view)
           path = if object.respond_to?(:to_partial_path)
             object.to_partial_path
           else
-            raise ArgumentError.new("'#{object.inspect}' is not an ActiveModel-compatible object. It must implement :to_partial_path.")
+            raise ArgumentError.new("'#{object.inspect}' is not an ActiveModel-compatible object. It must implement #to_partial_path.")
           end
 
           if view.prefix_partial_path_with_controller_namespace