Merge branch 'main' into active_storage-named-variants

Author: kaspth

.github/stale.yml

@@ -10,6 +10,8 @@ exemptLabels:
   - attached PR
   - regression
   - release blocker
+# Issues on a milestone will never be considered stale
+exemptMilestones: true
 # Label to use when marking an issue as stale
 staleLabel: stale
 # Comment to post when marking an issue as stale. Set to `false` to disable
@@ -18,7 +20,7 @@ markComment: >
 
   The resources of the Rails team are limited, and so we are asking for your help.
 
-  If you can still reproduce this error on the `6-0-stable` branch or on `master`,
+  If you can still reproduce this error on the `6-1-stable` branch or on `main`,
   please reply with all of the information you have about it in order to keep the issue open.
 
   Thank you for all your contributions.

.github/verba-sequentur.yml

@@ -0,0 +1,21 @@
+# Documentation: https://github.com/jonathanhefner/verba-sequentur
+
+"support request":
+  comment: >
+    This appears to be a request for technical support. We reserve the
+    issue tracker for issues only. For technical support questions,
+    please use the [rubyonrails-talk](https://discuss.rubyonrails.org/c/rubyonrails-talk/7)
+    forum or [Stack Overflow](https://stackoverflow.com/questions/tagged/ruby-on-rails),
+    where a wider community can help you.
+  close: true
+
+"feature request":
+  comment: >
+    This appears to be a feature request. We generally do not take
+    feature requests, and we reserve the issue tracker for issues only.
+    We recommend you [try to implement the feature](
+    https://guides.rubyonrails.org/contributing_to_ruby_on_rails.html#contributing-to-the-rails-code),
+    and send us a pull request instead. If you are unsure if the feature
+    would be accepted, please ask on the [rubyonrails-core](
+    https://discuss.rubyonrails.org/c/rubyonrails-core/5) forum.
+  close: true

.gitignore

@@ -10,6 +10,7 @@
 /dist/
 /doc/
 /guides/output/
+Brewfile.lock.json
 debug.log
 node_modules/
 package-lock.json

.rubocop.yml

@@ -1,4 +1,5 @@
 require:
+  - rubocop-packaging
   - rubocop-performance
   - rubocop-rails
 
@@ -7,12 +8,12 @@ AllCops:
   # RuboCop has a bunch of cops enabled by default. This setting tells RuboCop
   # to ignore them, so only the ones explicitly set in this file are enabled.
   DisabledByDefault: true
+  SuggestExtensions: false
   Exclude:
     - '**/tmp/**/*'
     - '**/templates/**/*'
     - '**/vendor/**/*'
     - 'actionpack/lib/action_dispatch/journey/parser.rb'
-    - 'railties/test/fixtures/tmp/**/*'
     - 'actionmailbox/test/dummy/**/*'
     - 'actiontext/test/dummy/**/*'
     - '**/node_modules/**/*'
@@ -119,6 +120,9 @@ Layout/SpaceAroundEqualsInParameterDefault:
 Layout/SpaceAroundKeyword:
   Enabled: true
 
+Layout/SpaceAroundOperators:
+  Enabled: true
+
 Layout/SpaceBeforeComma:
   Enabled: true
 
@@ -194,6 +198,9 @@ Lint/AmbiguousOperator:
 Lint/AmbiguousRegexpLiteral:
   Enabled: true
 
+Lint/DuplicateRequire:
+  Enabled: true
+
 Lint/ErbNewArguments:
   Enabled: true
 
@@ -232,6 +239,9 @@ Style/RedundantReturn:
   Enabled: true
   AllowMultipleReturnValues: true
 
+Style/RedundantRegexpEscape:
+  Enabled: true
+
 Style/Semicolon:
   Enabled: true
   AllowAsExpressionSeparator: true
@@ -263,3 +273,9 @@ Performance/ReverseEach:
 
 Performance/UnfreezeString:
   Enabled: true
+
+Performance/DeletePrefix:
+  Enabled: true
+
+Performance/DeleteSuffix:
+  Enabled: true

CONTRIBUTING.md

@@ -1,3 +1,8 @@
+[![Build Status](https://badge.buildkite.com/ab1152b6a1f6a61d3ea4ec5b3eece8d4c2b830998459c75352.svg?branch=main)](https://buildkite.com/rails/rails)
+[![Code Triage Badge](https://www.codetriage.com/rails/rails/badges/users.svg)](https://www.codetriage.com/rails/rails)
+[![Version](https://img.shields.io/gem/v/rails)](https://rubygems.org/gems/rails)
+[![License](https://img.shields.io/github/license/rails/rails)](https://github.com/rails/rails)
+
 ## How to contribute to Ruby on Rails
 
 #### **Did you find a bug?**
@@ -10,9 +15,9 @@
 * If you're unable to find an open issue addressing the problem, [open a new one](https://github.com/rails/rails/issues/new). Be sure to include a **title and clear description**, as much relevant information as possible, and a **code sample** or an **executable test case** demonstrating the expected behavior that is not occurring.
 
 * If possible, use the relevant bug report templates to create the issue. Simply copy the content of the appropriate template into a .rb file, make the necessary changes to demonstrate the issue, and **paste the content into the issue description**:
-  * [**Active Record** (models, database) issues](https://github.com/rails/rails/blob/master/guides/bug_report_templates/active_record_master.rb)
-  * [**Action Pack** (controllers, routing) issues](https://github.com/rails/rails/blob/master/guides/bug_report_templates/action_controller_master.rb)
-  * [**Generic template** for other issues](https://github.com/rails/rails/blob/master/guides/bug_report_templates/generic_master.rb)
+  * [**Active Record** (models, database) issues](https://github.com/rails/rails/blob/main/guides/bug_report_templates/active_record_main.rb)
+  * [**Action Pack** (controllers, routing) issues](https://github.com/rails/rails/blob/main/guides/bug_report_templates/action_controller_main.rb)
+  * [**Generic template** for other issues](https://github.com/rails/rails/blob/main/guides/bug_report_templates/generic_main.rb)
 
 * For more detailed information on submitting a bug report and creating an issue, visit our [reporting guidelines](https://edgeguides.rubyonrails.org/contributing_to_ruby_on_rails.html#reporting-an-issue).
 
@@ -42,7 +47,7 @@ Changes that are cosmetic in nature and do not add anything substantial to the s
 
 * Please read [Contributing to the Rails Documentation](https://edgeguides.rubyonrails.org/contributing_to_ruby_on_rails.html#contributing-to-the-rails-documentation).
 
-Ruby on Rails is a volunteer effort. We encourage you to pitch in and [join the team](https://contributors.rubyonrails.org)!
+Ruby on Rails is a volunteer effort. We encourage you to pitch in and join [the team](https://contributors.rubyonrails.org)!
 
 Thanks! :heart: :heart: :heart:
 

Gemfile

@@ -10,7 +10,7 @@ gemspec
 gem "rake", ">= 11.1"
 
 gem "capybara", ">= 3.26"
-gem "selenium-webdriver", ">= 3.141.592"
+gem "selenium-webdriver", ">= 4.0.0.alpha7"
 
 gem "rack-cache", "~> 1.2"
 gem "sass-rails"
@@ -29,27 +29,30 @@ gem "uglifier", ">= 1.3.0", require: false
 gem "json", ">= 2.0.0"
 
 group :rubocop do
-  gem "rubocop", ">= 0.47", require: false
+  gem "rubocop", ">= 0.90", require: false
+  gem "rubocop-packaging", require: false
   gem "rubocop-performance", require: false
   gem "rubocop-rails", require: false
 end
 
 group :doc do
-  gem "sdoc", "~> 1.1"
+  gem "sdoc", ">= 2.0.3"
   gem "redcarpet", "~> 3.2.3", platforms: :ruby
-  gem "w3c_validators"
+  gem "w3c_validators", "~> 1.3.6"
   gem "kindlerb", "~> 1.2.0"
+  gem "rouge"
 end
 
 # Active Support
 gem "dalli"
-gem "listen", "~> 3.2", require: false
+gem "listen", "~> 3.3", require: false
 gem "libxml-ruby", platforms: :ruby
 gem "connection_pool", require: false
 gem "rexml", require: false
 
-# for railties app_generator_test
+# for railties
 gem "bootsnap", ">= 1.4.4", require: false
+gem "webrick", require: false
 
 # Active Job
 group :job do
@@ -73,13 +76,9 @@ group :cable do
   gem "hiredis", require: false
   gem "redis", "~> 4.0", require: false
 
-  gem "redis-namespace"
+  gem "redis-namespace", github: "resque/redis-namespace"
 
   gem "websocket-client-simple", github: "matthewd/websocket-client-simple", branch: "close-race", require: false
-
-  gem "blade", require: false, platforms: [:ruby]
-  gem "blade-sauce_labs_plugin", require: false, platforms: [:ruby]
-  gem "sprockets-export", require: false
 end
 
 # Active Storage
@@ -100,6 +99,12 @@ 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
@@ -114,11 +119,11 @@ group :test do
     gem "byebug"
   end
 
-  gem "benchmark-ips", "< 2.8"
+  gem "benchmark-ips"
 end
 
 platforms :ruby, :mswin, :mswin64, :mingw, :x64_mingw do
-  gem "nokogiri", ">= 1.8.1"
+  gem "nokogiri", ">= 1.8.1", "!= 1.11.0"
 
   # Needed for compiling the ActionDispatch::Journey parser.
   gem "racc", ">=1.4.6", require: false
@@ -128,7 +133,7 @@ platforms :ruby, :mswin, :mswin64, :mingw, :x64_mingw do
 
   group :db do
     gem "pg", "~> 1.1"
-    gem "mysql2", "~> 0.5"
+    gem "mysql2", "~> 0.5", github: "brianmario/mysql2"
   end
 end