🔧 Switch to main branch

pboling · pboling · commit a2acbf892e2e · 2022-08-23T15:53:21.000+07:00
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -13,10 +13,10 @@ name: "CodeQL"
 
 on:
   push:
-    branches: [ master, main, "*-stable" ]
+    branches: [ main, "*-maintenance" ]
   pull_request:
     # The branches below must be a subset of the branches above
-    branches: [ master, main, "*-stable" ]
+    branches: [ main, "*-maintenance" ]
   schedule:
     - cron: '35 1 * * 5'
 
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
@@ -8,7 +8,6 @@ on:
   push:
     branches:
       - 'main'
-      - 'master'
       - '*-maintenance'
       - '*-dev'
       - '*-stable'
diff --git a/.github/workflows/danger.yml b/.github/workflows/danger.yml
@@ -4,8 +4,7 @@ on:
   pull_request:
     branches:
       - 'main'
-      - 'master'
-      - '*-stable'
+      - '*-maintenance'
 
 jobs:
   danger:
diff --git a/.github/workflows/heads.yml b/.github/workflows/heads.yml
@@ -4,7 +4,6 @@ on:
   push:
     branches:
       - 'main'
-      - 'master'
       - '*-maintenance'
       - '*-dev'
       - '*-stable'
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -4,7 +4,6 @@ on:
   push:
     branches:
       - 'main'
-      - 'master'
       - '*-maintenance'
       - '*-dev'
       - '*-stable'
diff --git a/.github/workflows/style.yml b/.github/workflows/style.yml
@@ -4,7 +4,6 @@ on:
   push:
     branches:
       - 'main'
-      - 'master'
       - '*-maintenance'
       - '*-dev'
       - '*-stable'
diff --git a/.github/workflows/supported.yml b/.github/workflows/supported.yml
@@ -4,7 +4,6 @@ on:
   push:
     branches:
       - 'main'
-      - 'master'
       - '*-maintenance'
       - '*-dev'
       - '*-stable'
diff --git a/.github/workflows/unsupported.yml b/.github/workflows/unsupported.yml
@@ -4,7 +4,6 @@ on:
   push:
     branches:
       - 'main'
-      - 'master'
       - '*-maintenance'
       - '*-dev'
       - '*-stable'
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -4,7 +4,6 @@ on:
   push:
     branches:
       - 'main'
-      - 'master'
       - '*-maintenance'
       - '*-dev'
       - '*-stable'
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -13,6 +13,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Removed
 
+## [0.6.1] 2022-08-24
+### Changed
+* Fixed documentation in SECURITY.md
+* Change references to master => main
+
 ## [0.6.0] 2022-08-23
 ### Added
 * New option `body_hash_enabled` which defaults to true to maintain backward compatibility with prior releases. Setting to `false` disables generation of a `oauth_body_hash` component as part of the signature computation.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -16,8 +16,8 @@ Made with [contributors-img][contrib-rocks].
 
 [comment]: <> (Following links are used by README, CONTRIBUTING, Homepage)
 
-[conduct]: https://github.com/oauth-xx/oauth-ruby/blob/master/CODE_OF_CONDUCT.md
-[contributing]: https://github.com/oauth-xx/oauth-ruby/blob/master/CONTRIBUTING.md
+[conduct]: https://github.com/oauth-xx/oauth-ruby/blob/main/CODE_OF_CONDUCT.md
+[contributing]: https://github.com/oauth-xx/oauth-ruby/blob/main/CONTRIBUTING.md
 [contributors]: https://github.com/oauth-xx/oauth-ruby/graphs/contributors
 [mailinglist]: http://groups.google.com/group/oauth-ruby
 [source]: https://github.com/oauth-xx/oauth-ruby/
diff --git a/Dangerfile b/Dangerfile
@@ -10,6 +10,6 @@ warn("PR is classed as Work in Progress") if github.pr_title.include? "[WIP]"
 # Warn when there is a big PR
 warn("Big PR") if git.lines_of_code > 500
 
-# Don't let testing shortcuts get into master by accident
+# Don't let testing shortcuts get into main by accident
 raise("fdescribe left in tests") if `grep -r fdescribe specs/ `.length > 1
 raise("fit left in tests") if `grep -r fit specs/ `.length > 1
diff --git a/README.md b/README.md
@@ -1,9 +1,9 @@
 <p align="center">
     <a href="http://oauth.net/core/1.0/" target="_blank" rel="noopener">
-      <img width="124px" src="https://github.com/oauth-xx/oauth-ruby/raw/master/docs/images/logo/Oauth_logo.svg?raw=true" alt="OAuth 1.0 Logo by Chris Messina, CC BY-SA 3.0, via Wikimedia Commons">
+      <img width="124px" src="https://github.com/oauth-xx/oauth-ruby/raw/main/docs/images/logo/Oauth_logo.svg?raw=true" alt="OAuth 1.0 Logo by Chris Messina, CC BY-SA 3.0, via Wikimedia Commons">
     </a>
     <a href="https://www.ruby-lang.org/" target="_blank" rel="noopener">
-      <img width="124px" src="https://github.com/oauth-xx/oauth-ruby/raw/master/docs/images/logo/ruby-logo-198px.svg?raw=true" alt="Yukihiro Matsumoto, Ruby Visual Identity Team, CC BY-SA 2.5">
+      <img width="124px" src="https://github.com/oauth-xx/oauth-ruby/raw/main/docs/images/logo/ruby-logo-198px.svg?raw=true" alt="Yukihiro Matsumoto, Ruby Visual Identity Team, CC BY-SA 2.5">
     </a>
 </p>
 
@@ -120,11 +120,11 @@ The link tokens in the following sections should be kept ordered by the row and
 <!-- 5️⃣ coverage & security -->
 [⛳cclim-cov]: https://codeclimate.com/github/oauth-xx/oauth-ruby/test_coverage
 [⛳cclim-cov-img♻️]: https://api.codeclimate.com/v1/badges/3cf23270c21e8791d788/test_coverage
-[🖇codecov-img♻️]: https://codecov.io/gh/oauth-xx/oauth-ruby/branch/master/graph/badge.svg?token=4ZNAWNxrf9
+[🖇codecov-img♻️]: https://codecov.io/gh/oauth-xx/oauth-ruby/branch/main/graph/badge.svg?token=4ZNAWNxrf9
 [🖇codecov]: https://codecov.io/gh/oauth-xx/oauth-ruby
-[🏘coveralls]: https://coveralls.io/github/oauth-xx/oauth-ruby?branch=master
-[🏘coveralls-img]: https://coveralls.io/repos/github/oauth-xx/oauth-ruby/badge.svg?branch=master
-[🚎sec-pol]: https://github.com/oauth-xx/oauth-ruby/blob/master/SECURITY.md
+[🏘coveralls]: https://coveralls.io/github/oauth-xx/oauth-ruby?branch=main
+[🏘coveralls-img]: https://coveralls.io/repos/github/oauth-xx/oauth-ruby/badge.svg?branch=main
+[🚎sec-pol]: https://github.com/oauth-xx/oauth-ruby/blob/main/SECURITY.md
 [🚎sec-pol-img]: https://img.shields.io/badge/security-policy-brightgreen.svg?style=flat
 [🖐codeQL]: https://github.com/oauth-xx/oauth-ruby/security/code-scanning
 [🖐codeQL-img]: https://github.com/oauth-xx/oauth-ruby/actions/workflows/codeql-analysis.yml/badge.svg
@@ -184,11 +184,11 @@ Targeted ruby compatibility is non-EOL versions of Ruby, currently 2.7, 3.0, and
 3.1. Ruby is limited to 2.4+ in the gemspec, and this will change with minor version bumps,
 while the gem is still in 0.x, in accordance with the SemVer spec.
 
-The `master` branch now targets 1.0.x releases.
+The `main` branch now targets 1.0.x releases.
 See `v0.6-maintenance` branch for Ruby >= 2.4.
 See `v0.5-maintenance` branch for Ruby >= 2.0.
 
-NOTE: If there is another 0.5.x release it is anticipated to be the last of the 0.5.x series.
+NOTE: No further releases of the 0.5.x series are anticipated.
 
 <details>
   <summary>Ruby Engine Compatibility Policy</summary>
@@ -220,7 +220,7 @@ of a major release, support for that Ruby version may be dropped.
 
 |     | Ruby OAuth Version | Maintenance Branch | 🚂 Compatibility       | Official 💎          | Unofficial 💎                | Incidental 💎 |
 |:----|--------------------|--------------------|------------------------|----------------------|------------------------------|---------------|
-| 1️⃣ | 1.0.x              | `master`           | Rails 6, 7             | 2.7, 3.0, 3.1        | sorry, not sorry             | nope          |
+| 1️⃣ | 1.0.x              | `main`             | Rails 6, 7             | 2.7, 3.0, 3.1        | sorry, not sorry             | nope          |
 | 2️⃣ | 0.6.x              | `v0.6-maintenance` | Rails 5, 6, 7          | 2.7, 3.0, 3.1        | 2.5, 2.6                     | 2.4           |
 | 3️⃣ | 0.5.x              | `v0.5-maintenance` | Rails 2, 3, 4, 5, 6, 7 | 2.7, 3.0, 3.1        | 2.1, 2.2, 2.3, 2.4, 2.5, 2.6 | 2.0           |
 | 4️⃣ | older              | N/A                |                        | Best of luck to you! | Please upgrade!              | noop          |
@@ -344,8 +344,8 @@ Comments are welcome. Contact the [OAuth Ruby mailing list (Google Group)][maili
 
 [comment]: <> (Following links are used by README, CONTRIBUTING, Homepage)
 
-[conduct]: https://github.com/oauth-xx/oauth-ruby/blob/master/CODE_OF_CONDUCT.md
-[contributing]: https://github.com/oauth-xx/oauth-ruby/blob/master/CONTRIBUTING.md
+[conduct]: https://github.com/oauth-xx/oauth-ruby/blob/main/CODE_OF_CONDUCT.md
+[contributing]: https://github.com/oauth-xx/oauth-ruby/blob/main/CONTRIBUTING.md
 [contributors]: https://github.com/oauth-xx/oauth-ruby/graphs/contributors
 [mailinglist]: http://groups.google.com/group/oauth-ruby
 [source]: https://github.com/oauth-xx/oauth-ruby/
@@ -367,11 +367,11 @@ Comments are welcome. Contact the [OAuth Ruby mailing list (Google Group)][maili
 [followme-img]: https://img.shields.io/twitter/follow/galtzo.svg?style=social&label=Follow
 [gh_discussions]: https://github.com/oauth-xx/oauth-ruby/discussions
 [gh_sponsors]: https://github.com/sponsors/pboling
-[license]: https://github.com/oauth-xx/oauth-ruby/blob/master/LICENSE
+[license]: https://github.com/oauth-xx/oauth-ruby/blob/main/LICENSE
 [license-ref]: https://opensource.org/licenses/MIT
 [liberapay_donate]: https://liberapay.com/pboling/donate
 [pvc]: http://guides.rubygems.org/patterns/#pessimistic-version-constraint
 [rubygems]: https://rubygems.org/gems/oauth
-[security]: https://github.com/oauth-xx/oauth-ruby/blob/master/SECURITY.md
+[security]: https://github.com/oauth-xx/oauth-ruby/blob/main/SECURITY.md
 [semver]: http://semver.org/
 [tweetme]: http://twitter.com/galtzo
