Skip to content

Commit 077c66d

Browse files
committed
Rename master to main in all code references
1 parent 2d817d7 commit 077c66d

39 files changed

+108
-108
lines changed

.github/stale.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ markComment: >
2020
2121
The resources of the Rails team are limited, and so we are asking for your help.
2222
23-
If you can still reproduce this error on the `6-1-stable` branch or on `master`,
23+
If you can still reproduce this error on the `6-1-stable` branch or on `main`,
2424
please reply with all of the information you have about it in order to keep the issue open.
2525
2626
Thank you for all your contributions.

CONTRIBUTING.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
* 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.
1111

1212
* 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**:
13-
* [**Active Record** (models, database) issues](https://github.com/rails/rails/blob/master/guides/bug_report_templates/active_record_master.rb)
14-
* [**Action Pack** (controllers, routing) issues](https://github.com/rails/rails/blob/master/guides/bug_report_templates/action_controller_master.rb)
15-
* [**Generic template** for other issues](https://github.com/rails/rails/blob/master/guides/bug_report_templates/generic_master.rb)
13+
* [**Active Record** (models, database) issues](https://github.com/rails/rails/blob/main/guides/bug_report_templates/active_record_main.rb)
14+
* [**Action Pack** (controllers, routing) issues](https://github.com/rails/rails/blob/main/guides/bug_report_templates/action_controller_main.rb)
15+
* [**Generic template** for other issues](https://github.com/rails/rails/blob/main/guides/bug_report_templates/generic_main.rb)
1616

1717
* 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).
1818

README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ are bundled together in [Action Pack](actionpack/README.rdoc).
3737
The _**View layer**_ is composed of "templates" that are responsible for providing
3838
appropriate representations of your application's resources. Templates can
3939
come in a variety of formats, but most view templates are HTML with embedded
40-
Ruby code (ERB files). Views are typically rendered to generate a controller response
40+
Ruby code (ERB files). Views are typically rendered to generate a controller response
4141
or to generate the body of an email. In Rails, View generation is handled by [Action View](actionview/README.rdoc).
4242

4343
## Frameworks and libraries
@@ -96,7 +96,7 @@ Everyone interacting in Rails and its sub-projects' codebases, issue trackers, c
9696

9797
## Code Status
9898

99-
[![Build Status](https://badge.buildkite.com/ab1152b6a1f6a61d3ea4ec5b3eece8d4c2b830998459c75352.svg?branch=master)](https://buildkite.com/rails/rails)
99+
[![Build Status](https://badge.buildkite.com/ab1152b6a1f6a61d3ea4ec5b3eece8d4c2b830998459c75352.svg?branch=main)](https://buildkite.com/rails/rails)
100100

101101
## License
102102

RELEASING_RAILS.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ You can review the commits for the 3.0.10 release like this:
9393
```
9494

9595
If you're doing a stable branch release, you should also ensure that all of
96-
the CHANGELOG entries in the stable branch are also synced to the master
96+
the CHANGELOG entries in the stable branch are also synced to the main
9797
branch.
9898

9999
### Put the new version in the RAILS_VERSION file.

actionmailer/README.rdoc

+1-1
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ The latest version of Action Mailer can be installed with RubyGems:
116116

117117
Source code can be downloaded as part of the Rails project on GitHub:
118118

119-
* https://github.com/rails/rails/tree/master/actionmailer
119+
* https://github.com/rails/rails/tree/main/actionmailer
120120

121121

122122
== License

actionpack/README.rdoc

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ The latest version of Action Pack can be installed with RubyGems:
3333

3434
Source code can be downloaded as part of the Rails project on GitHub:
3535

36-
* https://github.com/rails/rails/tree/master/actionpack
36+
* https://github.com/rails/rails/tree/main/actionpack
3737

3838

3939
== License

actionview/README.rdoc

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ The latest version of Action View can be installed with RubyGems:
1515

1616
Source code can be downloaded as part of the Rails project on GitHub:
1717

18-
* https://github.com/rails/rails/tree/master/actionview
18+
* https://github.com/rails/rails/tree/main/actionview
1919

2020

2121
== License
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
22
Unobtrusive JavaScript
3-
https://github.com/rails/rails/blob/master/actionview/app/assets/javascripts
3+
https://github.com/rails/rails/blob/main/actionview/app/assets/javascripts
44
Released under the MIT license
55
*/

actionview/package.json

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

activejob/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ The latest version of Active Job can be installed with RubyGems:
106106

107107
Source code can be downloaded as part of the Rails project on GitHub:
108108

109-
* https://github.com/rails/rails/tree/master/activejob
109+
* https://github.com/rails/rails/tree/main/activejob
110110

111111

112112
## License

activemodel/README.rdoc

+1-1
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ The latest version of Active Model can be installed with RubyGems:
241241

242242
Source code can be downloaded as part of the Rails project on GitHub
243243

244-
* https://github.com/rails/rails/tree/master/activemodel
244+
* https://github.com/rails/rails/tree/main/activemodel
245245

246246

247247
== License

activerecord/README.rdoc

+1-1
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ The latest version of Active Record can be installed with RubyGems:
194194

195195
Source code can be downloaded as part of the Rails project on GitHub:
196196

197-
* https://github.com/rails/rails/tree/master/activerecord
197+
* https://github.com/rails/rails/tree/main/activerecord
198198

199199

200200
== License

activestorage/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ You can read more about Active Storage in the [Active Storage Overview](https://
1010

1111
## Compared to other storage solutions
1212

13-
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`.
13+
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`.
1414

1515
`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).
1616

activesupport/README.rdoc

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ The latest version of Active Support can be installed with RubyGems:
1515

1616
Source code can be downloaded as part of the Rails project on GitHub:
1717

18-
* https://github.com/rails/rails/tree/master/activesupport
18+
* https://github.com/rails/rails/tree/main/activesupport
1919

2020

2121
== License

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
git_source(:github) { |repo| "https://github.com/#{repo}.git" }
99

10-
gem "rails", github: "rails/rails"
10+
gem "rails", github: "rails/rails", branch: "main"
1111
end
1212

1313
require "action_controller/railtie"

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
git_source(:github) { |repo| "https://github.com/#{repo}.git" }
99

10-
gem "rails", github: "rails/rails"
10+
gem "rails", github: "rails/rails", branch: "main"
1111
gem "sqlite3"
1212
end
1313

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
git_source(:github) { |repo| "https://github.com/#{repo}.git" }
99

10-
gem "rails", github: "rails/rails"
10+
gem "rails", github: "rails/rails", branch: "main"
1111
end
1212

1313
require "active_job"

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
git_source(:github) { |repo| "https://github.com/#{repo}.git" }
99

10-
gem "rails", github: "rails/rails"
10+
gem "rails", github: "rails/rails", branch: "main"
1111
gem "sqlite3"
1212
end
1313

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
git_source(:github) { |repo| "https://github.com/#{repo}.git" }
99

10-
gem "rails", github: "rails/rails"
10+
gem "rails", github: "rails/rails", branch: "main"
1111
gem "sqlite3"
1212
end
1313

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
git_source(:github) { |repo| "https://github.com/#{repo}.git" }
99

10-
gem "rails", github: "rails/rails"
10+
gem "rails", github: "rails/rails", branch: "main"
1111
gem "sqlite3"
1212
end
1313

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
git_source(:github) { |repo| "https://github.com/#{repo}.git" }
99

10-
gem "rails", github: "rails/rails"
10+
gem "rails", github: "rails/rails", branch: "main"
1111
end
1212

1313
require "active_support"

guides/source/4_0_release_notes.md

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

guides/source/6_1_release_notes.md

+15-15
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Highlights in Rails 6.1:
1313

1414
These release notes cover only the major changes. To learn about various bug
1515
fixes and changes, please refer to the change logs or check out the [list of
16-
commits](https://github.com/rails/rails/commits/master) in the main Rails
16+
commits](https://github.com/rails/rails/commits/6-1-stable) in the main Rails
1717
repository on GitHub.
1818

1919
--------------------------------------------------------------------------------
@@ -185,7 +185,7 @@ Please refer to the [Changelog][action-mailer] for detailed changes.
185185

186186
### Removals
187187

188-
* Remove deprecated `ActionMailer::Base.receive` in favor of [Action Mailbox](https://github.com/rails/rails/tree/master/actionmailbox).
188+
* Remove deprecated `ActionMailer::Base.receive` in favor of [Action Mailbox](https://github.com/rails/rails/tree/6-1-stable/actionmailbox).
189189

190190
### Deprecations
191191

@@ -458,16 +458,16 @@ See the
458458
for the many people who spent many hours making Rails, the stable and robust
459459
framework it is. Kudos to all of them.
460460
461-
[railties]: https://github.com/rails/rails/blob/master/railties/CHANGELOG.md
462-
[action-pack]: https://github.com/rails/rails/blob/master/actionpack/CHANGELOG.md
463-
[action-view]: https://github.com/rails/rails/blob/master/actionview/CHANGELOG.md
464-
[action-mailer]: https://github.com/rails/rails/blob/master/actionmailer/CHANGELOG.md
465-
[action-cable]: https://github.com/rails/rails/blob/master/actioncable/CHANGELOG.md
466-
[active-record]: https://github.com/rails/rails/blob/master/activerecord/CHANGELOG.md
467-
[active-storage]: https://github.com/rails/rails/blob/master/activestorage/CHANGELOG.md
468-
[active-model]: https://github.com/rails/rails/blob/master/activemodel/CHANGELOG.md
469-
[active-support]: https://github.com/rails/rails/blob/master/activesupport/CHANGELOG.md
470-
[active-job]: https://github.com/rails/rails/blob/master/activejob/CHANGELOG.md
471-
[action-text]: https://github.com/rails/rails/blob/master/actiontext/CHANGELOG.md
472-
[action-mailbox]: https://github.com/rails/rails/blob/master/actionmailbox/CHANGELOG.md
473-
[guides]: https://github.com/rails/rails/blob/master/guides/CHANGELOG.md
461+
[railties]: https://github.com/rails/rails/blob/6-1-stable/railties/CHANGELOG.md
462+
[action-pack]: https://github.com/rails/rails/blob/6-1-stable/actionpack/CHANGELOG.md
463+
[action-view]: https://github.com/rails/rails/blob/6-1-stable/actionview/CHANGELOG.md
464+
[action-mailer]: https://github.com/rails/rails/blob/6-1-stable/actionmailer/CHANGELOG.md
465+
[action-cable]: https://github.com/rails/rails/blob/6-1-stable/actioncable/CHANGELOG.md
466+
[active-record]: https://github.com/rails/rails/blob/6-1-stable/activerecord/CHANGELOG.md
467+
[active-storage]: https://github.com/rails/rails/blob/6-1-stable/activestorage/CHANGELOG.md
468+
[active-model]: https://github.com/rails/rails/blob/6-1-stable/activemodel/CHANGELOG.md
469+
[active-support]: https://github.com/rails/rails/blob/6-1-stable/activesupport/CHANGELOG.md
470+
[active-job]: https://github.com/rails/rails/blob/6-1-stable/activejob/CHANGELOG.md
471+
[action-text]: https://github.com/rails/rails/blob/6-1-stable/actiontext/CHANGELOG.md
472+
[action-mailbox]: https://github.com/rails/rails/blob/6-1-stable/actionmailbox/CHANGELOG.md
473+
[guides]: https://github.com/rails/rails/blob/6-1-stable/guides/CHANGELOG.md

guides/source/6_2_release_notes.md

+13-13
Original file line numberDiff line numberDiff line change
@@ -170,16 +170,16 @@ See the
170170
for the many people who spent many hours making Rails, the stable and robust
171171
framework it is. Kudos to all of them.
172172

173-
[railties]: https://github.com/rails/rails/blob/master/railties/CHANGELOG.md
174-
[action-pack]: https://github.com/rails/rails/blob/master/actionpack/CHANGELOG.md
175-
[action-view]: https://github.com/rails/rails/blob/master/actionview/CHANGELOG.md
176-
[action-mailer]: https://github.com/rails/rails/blob/master/actionmailer/CHANGELOG.md
177-
[action-cable]: https://github.com/rails/rails/blob/master/actioncable/CHANGELOG.md
178-
[active-record]: https://github.com/rails/rails/blob/master/activerecord/CHANGELOG.md
179-
[active-storage]: https://github.com/rails/rails/blob/master/activestorage/CHANGELOG.md
180-
[active-model]: https://github.com/rails/rails/blob/master/activemodel/CHANGELOG.md
181-
[active-support]: https://github.com/rails/rails/blob/master/activesupport/CHANGELOG.md
182-
[active-job]: https://github.com/rails/rails/blob/master/activejob/CHANGELOG.md
183-
[action-text]: https://github.com/rails/rails/blob/master/actiontext/CHANGELOG.md
184-
[action-mailbox]: https://github.com/rails/rails/blob/master/actionmailbox/CHANGELOG.md
185-
[guides]: https://github.com/rails/rails/blob/master/guides/CHANGELOG.md
173+
[railties]: https://github.com/rails/rails/blob/main/railties/CHANGELOG.md
174+
[action-pack]: https://github.com/rails/rails/blob/main/actionpack/CHANGELOG.md
175+
[action-view]: https://github.com/rails/rails/blob/main/actionview/CHANGELOG.md
176+
[action-mailer]: https://github.com/rails/rails/blob/main/actionmailer/CHANGELOG.md
177+
[action-cable]: https://github.com/rails/rails/blob/main/actioncable/CHANGELOG.md
178+
[active-record]: https://github.com/rails/rails/blob/main/activerecord/CHANGELOG.md
179+
[active-storage]: https://github.com/rails/rails/blob/main/activestorage/CHANGELOG.md
180+
[active-model]: https://github.com/rails/rails/blob/main/activemodel/CHANGELOG.md
181+
[active-support]: https://github.com/rails/rails/blob/main/activesupport/CHANGELOG.md
182+
[active-job]: https://github.com/rails/rails/blob/main/activejob/CHANGELOG.md
183+
[action-text]: https://github.com/rails/rails/blob/main/actiontext/CHANGELOG.md
184+
[action-mailbox]: https://github.com/rails/rails/blob/main/actionmailbox/CHANGELOG.md
185+
[guides]: https://github.com/rails/rails/blob/main/guides/CHANGELOG.md

guides/source/_welcome.html.erb

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

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

guides/source/action_mailer_basics.md

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

guides/source/active_storage_overview.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -483,7 +483,7 @@ accessible by default. Anyone that knows the blob URL will be able to download i
483483
even if a `before_action` in your `ApplicationController` would otherwise
484484
require a login. If your files require a higher level of protection consider
485485
implementing your own authenticated
486-
[`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).
486+
[`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).
487487

488488
To create a download link, use the `rails_blob_{path|url}` helper. Using this
489489
helper allows you to set the disposition.
@@ -1006,5 +1006,5 @@ Implementing Support for Other Cloud Services
10061006

10071007
If you need to support a cloud service other than these, you will need to
10081008
implement the Service. Each service extends
1009-
[`ActiveStorage::Service`](https://github.com/rails/rails/blob/master/activestorage/lib/active_storage/service.rb)
1009+
[`ActiveStorage::Service`](https://github.com/rails/rails/blob/main/activestorage/lib/active_storage/service.rb)
10101010
by implementing the methods necessary to upload and download files to the cloud.

0 commit comments

Comments
 (0)