Merge branch 'main' into matt/show-all-headers-email-preview

Author: guilleiguaran

.devcontainer/Dockerfile

@@ -49,3 +49,4 @@ RUN cd /tmp/rails \
     && bundle install \
     && yarn install \
     && rm -rf /tmp/rails
+RUN chown -R vscode:vscode /usr/local/rvm

.github/pull_request_template.md

@@ -1,4 +1,16 @@
 <!--
+Thanks for contributing to Rails!
+
+Please do not make *Draft* pull requests, as they still send
+notifications to everyone watching the Rails repo.
+
+Create a pull request when it is ready for review and feedback
+from the Rails team :).
+
+If your pull request affects documentation or any non-code
+changes, guidelines for those changes are [available
+here](https://edgeguides.rubyonrails.org/contributing_to_ruby_on_rails.html#contributing-to-the-rails-documentation)
+
 About this template
 
 The following template aims to help contributors write a good description for their pull requests.
@@ -8,7 +20,10 @@ Feel free to discard it if you need to (e.g. when you just fix a typo). -->
 
 ### Motivation / Background
 
-<!-- Describe why this Pull Request needs to be merged. What bug have you fixed? What feature have you added? Why is it important? -->
+<!--
+Describe why this Pull Request needs to be merged. What bug have you fixed? What feature have you added? Why is it important?
+If you are fixing a specific issue, include "Fixes #ISSUE" (replace with the issue number, remove the quotes) and the issue will be linked to this PR.
+-->
 
 This Pull Request has been created because [REPLACE ME]
 
@@ -25,23 +40,6 @@ This Pull Request changes [REPLACE ME]
 Before submitting the PR make sure the following are checked:
 
 * [ ] This Pull Request is related to one change. Changes that are unrelated should be opened in separate PRs.
-* [ ] There are no typos in commit messages and comments.
 * [ ] Commit message has a detailed description of what changed and why. If this PR fixes a related issue include it in the commit message. Ex: `[Fix #issue-number]`
-* [ ] Feature branch is up-to-date with `main` (if not - rebase it).
-* [ ] Pull request only contains one commit for bug fixes and small features. If it's a larger feature, multiple commits are permitted but must be descriptive.
-* [ ] Tests are added if you fix a bug or add a feature.
+* [ ] Tests are added or updated if you fix a bug or add a feature.
 * [ ] CHANGELOG files are updated for the changed libraries if there is a behavior change or additional feature. Minor bug fixes and documentation changes should not be included.
-* [ ] PR is not in a draft state.
-* [ ] CI is passing.
-
-<!--
-Note: Please avoid making *Draft* pull requests, as they still send
-notifications to everyone watching the Rails repo.
-Create a pull request when it is ready for review and feedback
-from the Rails team :).
-
-If your pull request affects documentation or any non-code
-changes, guidelines for those changes are [available
-here](https://edgeguides.rubyonrails.org/contributing_to_ruby_on_rails.html#contributing-to-the-rails-documentation)
-
-Thanks for contributing to Rails! -->

.github/workflows/rubocop.yml

@@ -9,15 +9,15 @@ jobs:
   build:
     runs-on: ubuntu-latest
     env:
-      BUNDLE_WITHOUT: default doc job cable storage ujs test db
+      BUNDLE_ONLY: rubocop
 
     steps:
     - uses: actions/checkout@v3
 
-    - name: Set up Ruby 3.1
+    - name: Set up Ruby 3.2
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 3.1
+        ruby-version: 3.2
         bundler-cache: true
 
     - name: Run RuboCop

.rubocop.yml

@@ -211,6 +211,9 @@ Lint/AmbiguousRegexpLiteral:
 Lint/DuplicateRequire:
   Enabled: true
 
+Lint/DuplicateMagicComment:
+  Enabled: true
+
 Lint/DuplicateMethods:
   Enabled: true
 
@@ -236,6 +239,11 @@ Lint/UselessAssignment:
 Lint/DeprecatedClassMethods:
   Enabled: true
 
+Style/EvalWithLocation:
+  Enabled: true
+  Exclude:
+    - '**/test/**/*'
+
 Style/ParenthesesAroundCondition:
   Enabled: true
 

CODE_OF_CONDUCT.md

@@ -9,4 +9,3 @@ https://rubyonrails.org/conduct
 For a history of updates, see the page history here:
 
 https://github.com/rails/website/commits/main/_pages/conduct.html
-

CONTRIBUTING.md

@@ -39,6 +39,8 @@ Changes that are cosmetic in nature and do not add anything substantial to the s
 
 * Do not open an issue on GitHub until you have collected positive feedback about the change. GitHub issues are primarily intended for bug reports and fixes.
 
+* We generally reject changes to Active Support core extensions. Those change should be proposed in the [Ruby issue tracker instead](https://bugs.ruby-lang.org/issues), as we don't want to conflict with future versions of Ruby.
+
 #### **Do you have questions about the source code?**
 
 * Ask any question about how to use Ruby on Rails in the [rubyonrails-talk mailing list](https://discuss.rubyonrails.org/c/rubyonrails-talk).

Gemfile

@@ -10,11 +10,11 @@ else
 end
 
 # We need a newish Rake since Active Job sets its test tasks' descriptions.
-gem "rake", ">= 11.1"
+gem "rake", ">= 13"
 
 gem "sprockets-rails", ">= 2.0.0"
 gem "propshaft", ">= 0.1.7"
-gem "capybara", ">= 3.26"
+gem "capybara", ">= 3.38"
 gem "selenium-webdriver", ">= 4.0.0"
 
 gem "rack-cache", "~> 1.2"
@@ -36,6 +36,9 @@ gem "terser", ">= 1.1.4", require: false
 # Explicitly avoid 1.x that doesn't support Ruby 2.4+
 gem "json", ">= 2.0.0"
 
+# Workaround until Ruby ships with cgi version 0.3.6 or higher.
+gem "cgi", ">= 0.3.6", require: false
+
 group :rubocop do
   gem "rubocop", ">= 1.25.1", require: false
   gem "rubocop-minitest", require: false
@@ -45,7 +48,8 @@ group :rubocop do
 end
 
 group :doc do
-  gem "sdoc", ">= 2.4.0"
+  gem "sdoc", ">= 2.6.0"
+  gem "rdoc", "~> 6.5"
   gem "redcarpet", "~> 3.2.3", platforms: :ruby
   gem "w3c_validators", "~> 1.3.6"
   gem "rouge"
@@ -62,6 +66,12 @@ gem "rexml", require: false
 # for railties
 gem "bootsnap", ">= 1.4.4", require: false
 gem "webrick", require: false
+gem "jbuilder", require: false
+gem "web-console", require: false
+
+# Action Pack and railties
+rack_version = ENV.fetch("RACK", "~> 2.0") # Change to ~> 3 after #46594 is merged.
+gem "rack", rack_version
 
 # Active Job
 group :job do
@@ -74,12 +84,11 @@ group :job do
   gem "sneakers", require: false
   gem "backburner", require: false
   gem "delayed_job_active_record", require: false
-  gem "sequel", require: false
 end
 
 # Action Cable
 group :cable do
-  gem "puma", require: false
+  gem "puma", ">= 5.0.3", require: false
 
   gem "redis", ">= 4.0.1", require: false
 
@@ -105,12 +114,6 @@ group :ujs do
   gem "webdrivers"
 end
 
-# Action View
-group :view do
-  gem "blade", require: false, platforms: [:ruby]
-  gem "sprockets-export", require: false
-end
-
 # Add your own local bundler stuff.
 local_gemfile = File.expand_path(".Gemfile", __dir__)
 instance_eval File.read local_gemfile if File.exist? local_gemfile