Rename master to main in all code references

.github/stale.yml

@@ -20,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-1-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.

CONTRIBUTING.md

@@ -10,9 +10,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).
 

README.md

@@ -37,7 +37,7 @@ are bundled together in [Action Pack](actionpack/README.rdoc).
 The _**View layer**_ is composed of "templates" that are responsible for providing
 appropriate representations of your application's resources. Templates can
 come in a variety of formats, but most view templates are HTML with embedded
-Ruby code (ERB files). Views are typically rendered to generate a controller response 
+Ruby code (ERB files). Views are typically rendered to generate a controller response
 or to generate the body of an email. In Rails, View generation is handled by [Action View](actionview/README.rdoc).
 
 ## Frameworks and libraries
@@ -96,7 +96,7 @@ Everyone interacting in Rails and its sub-projects' codebases, issue trackers, c
 
 ## Code Status
 
-[![Build Status](https://badge.buildkite.com/ab1152b6a1f6a61d3ea4ec5b3eece8d4c2b830998459c75352.svg?branch=master)](https://buildkite.com/rails/rails)
+[![Build Status](https://badge.buildkite.com/ab1152b6a1f6a61d3ea4ec5b3eece8d4c2b830998459c75352.svg?branch=main)](https://buildkite.com/rails/rails)
 
 ## License
 

RELEASING_RAILS.md

@@ -93,7 +93,7 @@ You can review the commits for the 3.0.10 release like this:
 ```
 
 If you're doing a stable branch release, you should also ensure that all of
-the CHANGELOG entries in the stable branch are also synced to the master
+the CHANGELOG entries in the stable branch are also synced to the main
 branch.
 
 ### Put the new version in the RAILS_VERSION file.

actionmailer/README.rdoc

@@ -116,7 +116,7 @@ The latest version of Action Mailer can be installed with RubyGems:
 
 Source code can be downloaded as part of the Rails project on GitHub:
 
-* https://github.com/rails/rails/tree/master/actionmailer
+* https://github.com/rails/rails/tree/main/actionmailer
 
 
 == License

actionpack/README.rdoc

@@ -33,7 +33,7 @@ The latest version of Action Pack can be installed with RubyGems:
 
 Source code can be downloaded as part of the Rails project on GitHub:
 
-* https://github.com/rails/rails/tree/master/actionpack
+* https://github.com/rails/rails/tree/main/actionpack
 
 
 == License

actionview/README.rdoc

@@ -15,7 +15,7 @@ The latest version of Action View can be installed with RubyGems:
 
 Source code can be downloaded as part of the Rails project on GitHub:
 
-* https://github.com/rails/rails/tree/master/actionview
+* https://github.com/rails/rails/tree/main/actionview
 
 
 == License

actionview/app/assets/javascripts/rails-ujs/BANNER.js

@@ -1,5 +1,5 @@
 /*
 Unobtrusive JavaScript
-https://github.com/rails/rails/blob/master/actionview/app/assets/javascripts
+https://github.com/rails/rails/blob/main/actionview/app/assets/javascripts
 Released under the MIT license
  */

actionview/package.json

@@ -11,7 +11,7 @@
   },
   "scripts": {
     "build": "bundle exec blade build",
-    "test": "echo \"See the README: https://github.com/rails/rails/blob/master/actionview/app/assets/javascripts#how-to-run-tests\" && exit 1",
+    "test": "echo \"See the README: https://github.com/rails/rails/blob/main/actionview/app/assets/javascripts#how-to-run-tests\" && exit 1",
     "lint": "coffeelint app/assets/javascripts && eslint test/ujs/public/test"
   },
   "repository": {

activejob/README.md

@@ -106,7 +106,7 @@ The latest version of Active Job can be installed with RubyGems:
 
 Source code can be downloaded as part of the Rails project on GitHub:
 
-* https://github.com/rails/rails/tree/master/activejob
+* https://github.com/rails/rails/tree/main/activejob
 
 
 ## License

activemodel/README.rdoc

@@ -241,7 +241,7 @@ The latest version of Active Model can be installed with RubyGems:
 
 Source code can be downloaded as part of the Rails project on GitHub
 
-* https://github.com/rails/rails/tree/master/activemodel
+* https://github.com/rails/rails/tree/main/activemodel
 
 
 == License

activerecord/README.rdoc

@@ -194,7 +194,7 @@ The latest version of Active Record can be installed with RubyGems:
 
 Source code can be downloaded as part of the Rails project on GitHub:
 
-* https://github.com/rails/rails/tree/master/activerecord
+* https://github.com/rails/rails/tree/main/activerecord
 
 
 == License

activestorage/README.md

@@ -10,7 +10,7 @@ You can read more about Active Storage in the [Active Storage Overview](https://
 
 ## Compared to other storage solutions
 
-A key difference to how Active Storage works compared to other attachment solutions in Rails is through the use of built-in [Blob](https://github.com/rails/rails/blob/master/activestorage/app/models/active_storage/blob.rb) and [Attachment](https://github.com/rails/rails/blob/master/activestorage/app/models/active_storage/attachment.rb) models (backed by Active Record). This means existing application models do not need to be modified with additional columns to associate with files. Active Storage uses polymorphic associations via the `Attachment` join model, which then connects to the actual `Blob`.
+A key difference to how Active Storage works compared to other attachment solutions in Rails is through the use of built-in [Blob](https://github.com/rails/rails/blob/main/activestorage/app/models/active_storage/blob.rb) and [Attachment](https://github.com/rails/rails/blob/main/activestorage/app/models/active_storage/attachment.rb) models (backed by Active Record). This means existing application models do not need to be modified with additional columns to associate with files. Active Storage uses polymorphic associations via the `Attachment` join model, which then connects to the actual `Blob`.
 
 `Blob` models store attachment metadata (filename, content-type, etc.), and their identifier key in the storage service. Blob models do not store the actual binary data. They are intended to be immutable in spirit. One file, one blob. You can associate the same blob with multiple application models as well. And if you want to do transformations of a given `Blob`, the idea is that you'll simply create a new one, rather than attempt to mutate the existing one (though of course you can delete the previous version later if you don't need it).
 

activesupport/README.rdoc

@@ -15,7 +15,7 @@ The latest version of Active Support can be installed with RubyGems:
 
 Source code can be downloaded as part of the Rails project on GitHub:
 
-* https://github.com/rails/rails/tree/master/activesupport
+* https://github.com/rails/rails/tree/main/activesupport
 
 
 == License

guides/bug_report_templates/action_controller_master.rb → guides/bug_report_templates/action_controller_main.rb

@@ -7,7 +7,7 @@
 
   git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
-  gem "rails", github: "rails/rails"
+  gem "rails", github: "rails/rails", branch: "main"
 end
 
 require "action_controller/railtie"

guides/bug_report_templates/action_mailbox_master.rb → guides/bug_report_templates/action_mailbox_main.rb

@@ -7,7 +7,7 @@
 
   git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
-  gem "rails", github: "rails/rails"
+  gem "rails", github: "rails/rails", branch: "main"
   gem "sqlite3"
 end
 

guides/bug_report_templates/active_job_master.rb → guides/bug_report_templates/active_job_main.rb

@@ -7,7 +7,7 @@
 
   git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
-  gem "rails", github: "rails/rails"
+  gem "rails", github: "rails/rails", branch: "main"
 end
 
 require "active_job"

guides/bug_report_templates/active_record_master.rb → guides/bug_report_templates/active_record_main.rb

@@ -7,7 +7,7 @@
 
   git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
-  gem "rails", github: "rails/rails"
+  gem "rails", github: "rails/rails", branch: "main"
   gem "sqlite3"
 end
 

guides/bug_report_templates/active_record_migrations_master.rb → guides/bug_report_templates/active_record_migrations_main.rb

@@ -7,7 +7,7 @@
 
   git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
-  gem "rails", github: "rails/rails"
+  gem "rails", github: "rails/rails", branch: "main"
   gem "sqlite3"
 end
 

guides/bug_report_templates/active_storage_master.rb → guides/bug_report_templates/active_storage_main.rb

@@ -7,7 +7,7 @@
 
   git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
-  gem "rails", github: "rails/rails"
+  gem "rails", github: "rails/rails", branch: "main"
   gem "sqlite3"
 end
 

guides/bug_report_templates/generic_master.rb → guides/bug_report_templates/generic_main.rb

@@ -7,7 +7,7 @@
 
   git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
-  gem "rails", github: "rails/rails"
+  gem "rails", github: "rails/rails", branch: "main"
 end
 
 require "active_support"

guides/source/4_0_release_notes.md

@@ -234,11 +234,11 @@ Please refer to the [Changelog](https://github.com/rails/rails/blob/4-0-stable/a
       The method `change_table` is also reversible, as long as its block doesn't call `remove`, `change` or `change_default`
 
     * New method `reversible` makes it possible to specify code to be run when migrating up or down.
-      See the [Guide on Migration](https://github.com/rails/rails/blob/master/guides/source/active_record_migrations.md#using-reversible)
+      See the [Guide on Migration](https://github.com/rails/rails/blob/main/guides/source/active_record_migrations.md#using-reversible)
 
     * New method `revert` will revert a whole migration or the given block.
       If migrating down, the given migration / block is run normally.
-      See the [Guide on Migration](https://github.com/rails/rails/blob/master/guides/source/active_record_migrations.md#reverting-previous-migrations)
+      See the [Guide on Migration](https://github.com/rails/rails/blob/main/guides/source/active_record_migrations.md#reverting-previous-migrations)
 
 * Adds PostgreSQL array type support. Any datatype can be used to create an array column, with full migration and schema dumper support.
 

guides/source/6_1_release_notes.md

@@ -13,7 +13,7 @@ Highlights in Rails 6.1:
 
 These release notes cover only the major changes. To learn about various bug
 fixes and changes, please refer to the change logs or check out the [list of
-commits](https://github.com/rails/rails/commits/master) in the main Rails
+commits](https://github.com/rails/rails/commits/6-1-stable) in the main Rails
 repository on GitHub.
 
 --------------------------------------------------------------------------------
@@ -185,7 +185,7 @@ Please refer to the [Changelog][action-mailer] for detailed changes.
 
 ### Removals
 
-*   Remove deprecated `ActionMailer::Base.receive` in favor of [Action Mailbox](https://github.com/rails/rails/tree/master/actionmailbox).
+*   Remove deprecated `ActionMailer::Base.receive` in favor of [Action Mailbox](https://github.com/rails/rails/tree/6-1-stable/actionmailbox).
 
 ### Deprecations
 
@@ -458,16 +458,16 @@ See the
 for the many people who spent many hours making Rails, the stable and robust
 framework it is. Kudos to all of them.
 
-[railties]:       https://github.com/rails/rails/blob/master/railties/CHANGELOG.md
-[action-pack]:    https://github.com/rails/rails/blob/master/actionpack/CHANGELOG.md
-[action-view]:    https://github.com/rails/rails/blob/master/actionview/CHANGELOG.md
-[action-mailer]:  https://github.com/rails/rails/blob/master/actionmailer/CHANGELOG.md
-[action-cable]:   https://github.com/rails/rails/blob/master/actioncable/CHANGELOG.md
-[active-record]:  https://github.com/rails/rails/blob/master/activerecord/CHANGELOG.md
-[active-storage]: https://github.com/rails/rails/blob/master/activestorage/CHANGELOG.md
-[active-model]:   https://github.com/rails/rails/blob/master/activemodel/CHANGELOG.md
-[active-support]: https://github.com/rails/rails/blob/master/activesupport/CHANGELOG.md
-[active-job]:     https://github.com/rails/rails/blob/master/activejob/CHANGELOG.md
-[action-text]:    https://github.com/rails/rails/blob/master/actiontext/CHANGELOG.md
-[action-mailbox]: https://github.com/rails/rails/blob/master/actionmailbox/CHANGELOG.md
-[guides]:         https://github.com/rails/rails/blob/master/guides/CHANGELOG.md
+[railties]:       https://github.com/rails/rails/blob/6-1-stable/railties/CHANGELOG.md
+[action-pack]:    https://github.com/rails/rails/blob/6-1-stable/actionpack/CHANGELOG.md
+[action-view]:    https://github.com/rails/rails/blob/6-1-stable/actionview/CHANGELOG.md
+[action-mailer]:  https://github.com/rails/rails/blob/6-1-stable/actionmailer/CHANGELOG.md
+[action-cable]:   https://github.com/rails/rails/blob/6-1-stable/actioncable/CHANGELOG.md
+[active-record]:  https://github.com/rails/rails/blob/6-1-stable/activerecord/CHANGELOG.md
+[active-storage]: https://github.com/rails/rails/blob/6-1-stable/activestorage/CHANGELOG.md
+[active-model]:   https://github.com/rails/rails/blob/6-1-stable/activemodel/CHANGELOG.md
+[active-support]: https://github.com/rails/rails/blob/6-1-stable/activesupport/CHANGELOG.md
+[active-job]:     https://github.com/rails/rails/blob/6-1-stable/activejob/CHANGELOG.md
+[action-text]:    https://github.com/rails/rails/blob/6-1-stable/actiontext/CHANGELOG.md
+[action-mailbox]: https://github.com/rails/rails/blob/6-1-stable/actionmailbox/CHANGELOG.md
+[guides]:         https://github.com/rails/rails/blob/6-1-stable/guides/CHANGELOG.md

guides/source/6_2_release_notes.md

@@ -170,16 +170,16 @@ See the
 for the many people who spent many hours making Rails, the stable and robust
 framework it is. Kudos to all of them.
 
-[railties]:       https://github.com/rails/rails/blob/master/railties/CHANGELOG.md
-[action-pack]:    https://github.com/rails/rails/blob/master/actionpack/CHANGELOG.md
-[action-view]:    https://github.com/rails/rails/blob/master/actionview/CHANGELOG.md
-[action-mailer]:  https://github.com/rails/rails/blob/master/actionmailer/CHANGELOG.md
-[action-cable]:   https://github.com/rails/rails/blob/master/actioncable/CHANGELOG.md
-[active-record]:  https://github.com/rails/rails/blob/master/activerecord/CHANGELOG.md
-[active-storage]: https://github.com/rails/rails/blob/master/activestorage/CHANGELOG.md
-[active-model]:   https://github.com/rails/rails/blob/master/activemodel/CHANGELOG.md
-[active-support]: https://github.com/rails/rails/blob/master/activesupport/CHANGELOG.md
-[active-job]:     https://github.com/rails/rails/blob/master/activejob/CHANGELOG.md
-[action-text]:    https://github.com/rails/rails/blob/master/actiontext/CHANGELOG.md
-[action-mailbox]: https://github.com/rails/rails/blob/master/actionmailbox/CHANGELOG.md
-[guides]:         https://github.com/rails/rails/blob/master/guides/CHANGELOG.md
+[railties]:       https://github.com/rails/rails/blob/main/railties/CHANGELOG.md
+[action-pack]:    https://github.com/rails/rails/blob/main/actionpack/CHANGELOG.md
+[action-view]:    https://github.com/rails/rails/blob/main/actionview/CHANGELOG.md
+[action-mailer]:  https://github.com/rails/rails/blob/main/actionmailer/CHANGELOG.md
+[action-cable]:   https://github.com/rails/rails/blob/main/actioncable/CHANGELOG.md
+[active-record]:  https://github.com/rails/rails/blob/main/activerecord/CHANGELOG.md
+[active-storage]: https://github.com/rails/rails/blob/main/activestorage/CHANGELOG.md
+[active-model]:   https://github.com/rails/rails/blob/main/activemodel/CHANGELOG.md
+[active-support]: https://github.com/rails/rails/blob/main/activesupport/CHANGELOG.md
+[active-job]:     https://github.com/rails/rails/blob/main/activejob/CHANGELOG.md
+[action-text]:    https://github.com/rails/rails/blob/main/actiontext/CHANGELOG.md
+[action-mailbox]: https://github.com/rails/rails/blob/main/actionmailbox/CHANGELOG.md
+[guides]:         https://github.com/rails/rails/blob/main/guides/CHANGELOG.md

guides/source/_welcome.html.erb

@@ -2,7 +2,7 @@
 
 <% if @edge %>
 <p>
-  These are <b>Edge Guides</b>, based on <a href="https://github.com/rails/rails/tree/<%= @edge %>">master@<%= @edge[0, 7] %></a>.
+  These are <b>Edge Guides</b>, based on <a href="https://github.com/rails/rails/tree/<%= @edge %>">main@<%= @edge[0, 7] %></a>.
 </p>
 <p>
   If you are looking for the ones for the stable version, please check

guides/source/action_mailer_basics.md

@@ -608,7 +608,7 @@ URL helper.
 <%= user_url(@user, host: 'example.com') %>
 ```
 
-NOTE: non-`GET` links require [rails-ujs](https://github.com/rails/rails/blob/master/actionview/app/assets/javascripts) or
+NOTE: non-`GET` links require [rails-ujs](https://github.com/rails/rails/blob/main/actionview/app/assets/javascripts) or
 [jQuery UJS](https://github.com/rails/jquery-ujs), and won't work in mailer templates.
 They will result in normal `GET` requests.
 

guides/source/active_storage_overview.md

@@ -483,7 +483,7 @@ accessible by default. Anyone that knows the blob URL will be able to download i
 even if a `before_action` in your `ApplicationController` would otherwise
 require a login. If your files require a higher level of protection consider
 implementing your own authenticated
-[`ActiveStorage::Blobs::RedirectController`](https://github.com/rails/rails/blob/master/activestorage/app/controllers/active_storage/blobs/redirect_controller.rb) and [`ActiveStorage::Representations::RedirectController`](https://github.com/rails/rails/blob/master/activestorage/app/controllers/active_storage/representations/redirect_controller.rb).
+[`ActiveStorage::Blobs::RedirectController`](https://github.com/rails/rails/blob/main/activestorage/app/controllers/active_storage/blobs/redirect_controller.rb) and [`ActiveStorage::Representations::RedirectController`](https://github.com/rails/rails/blob/main/activestorage/app/controllers/active_storage/representations/redirect_controller.rb).
 
 To create a download link, use the `rails_blob_{path|url}` helper. Using this
 helper allows you to set the disposition.
@@ -1006,5 +1006,5 @@ Implementing Support for Other Cloud Services
 
 If you need to support a cloud service other than these, you will need to
 implement the Service. Each service extends
-[`ActiveStorage::Service`](https://github.com/rails/rails/blob/master/activestorage/lib/active_storage/service.rb)
+[`ActiveStorage::Service`](https://github.com/rails/rails/blob/main/activestorage/lib/active_storage/service.rb)
 by implementing the methods necessary to upload and download files to the cloud.