Merge branch 'master' into rails-7-1

CONTRIBUTING.md

@@ -1,9 +1,9 @@
 # Contributing
 
-We love contributions from everyone.  By participating in this project, you
+We love contributions from everyone. By participating in this project, you
 agree to abide by our [code of conduct].
 
-[code of conduct]: CODE_OF_CONDUCT.md
+[code of conduct]: https://thoughtbot.com/open-source-code-of-conduct
 
 ## Contributing Code
 
@@ -19,6 +19,6 @@ agree to abide by our [code of conduct].
 
 [good commit message]: http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html
 
-Others will give constructive feedback.  This is a time for discussion and
+Others will give constructive feedback. This is a time for discussion and
 improvements, and making the necessary changes will be required before we can
 merge the contribution.