Skip to content

Commit c7d931d

Browse files
author
Benjamin A. Stockwell
committed
Change 'master' references to 'main'.
1 parent 348c2fc commit c7d931d

7 files changed

+10
-13
lines changed

.circleci/config.yml

+1-3
Original file line numberDiff line numberDiff line change
@@ -87,9 +87,7 @@ workflows:
8787
- build
8888
filters:
8989
branches:
90-
only: master
90+
only: main
9191
- upload-codecov:
9292
requires:
9393
- build
94-
95-

.github/release-drafter.yml

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name-template: 'v$NEXT_PATCH_VERSION'
22
tag-template: 'v$NEXT_PATCH_VERSION'
33
change-template: '*#$NUMBER - $TITLE'
4-
branches: master
4+
branches: main
55
categories:
66
- title: 'Features 🚀'
77
labels:
@@ -20,4 +20,3 @@ template: |
2020
$CHANGES
2121
2222
Release Contributors: $CONTRIBUTORS
23-

CONTRIBUTING.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ Here are the steps to running the tests for SSO:
7474

7575
Changes to `buzzfeed/sso` happen via GitHub pull requests, which is where at least one other engineer reviews and approves all code changes. Some tips for pull requests and code review:
7676

77-
* Each pull request is a branch from `master` — there are no other long-lived branches
77+
* Each pull request is a branch from `main` — there are no other long-lived branches
7878
* A single pull request is used for each set of changes — i.e., once a pull request has been opened, any follow-up commits to address code review and discussion should be pushed to that pull request instead of a new one
7979
* Before a pull request is merged, it must get a green check mark from our CI for passing tests
8080
* Before a pull request is merged, the author should take the opportunity to clean up and rewrite the commits on the branch (see [How to Write a Git Commit Message](https://chris.beams.io/posts/git-commit/).
@@ -92,4 +92,4 @@ In order to allow SSO to be the most useful, while balancing feature needs with
9292
* We will do our best to merge every contribution that enables a requested feature or solves an issue that blocks folks using SSO.
9393
* As we find more efficient, secure, or otherwise stronger solutions, we will deprecate old features and replace them.
9494

95-
Our strategy will be to announce deprecation as part of a stable release, and remove functionality as part of the next stable release. While this is a very quick cycle, we believe it is the best approach for keeping SSO up to date and preventing reliance on outdated featuresets.
95+
Our strategy will be to announce deprecation as part of a stable release, and remove functionality as part of the next stable release. While this is a very quick cycle, we believe it is the best approach for keeping SSO up to date and preventing reliance on outdated featuresets.

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
[![CircleCI](https://circleci.com/gh/buzzfeed/sso.svg?style=svg)](https://circleci.com/gh/buzzfeed/sso)
66
[![MIT license](http://img.shields.io/badge/license-MIT-brightgreen.svg)](http://opensource.org/licenses/MIT)
77
[![Docker Automated build](https://img.shields.io/docker/automated/buzzfeed/sso.svg)](https://hub.docker.com/r/buzzfeed/sso/)
8-
[![codecov.io](https://codecov.io/github/buzzfeed/sso/coverage.svg?branch=master)](https://codecov.io/github/buzzfeed/sso?branch=master)
8+
[![codecov.io](https://codecov.io/github/buzzfeed/sso/coverage.svg?branch=main)](https://codecov.io/github/buzzfeed/sso?branch=main)
99

1010

1111
<img src="https://user-images.githubusercontent.com/10510566/44476420-a64e5980-a605-11e8-8ad9-2820109deb75.png" width="128px">

docs/okta_provider_setup.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ For 'Platform', choose `Web`, and for 'Sign on method' choose `OpenID Connect`.
4949
`https://sso-auth.example.com/okta/callback`. Multiple URIs can be added if required.
5050
- **Logout redirect URIs**: This can be left blank.
5151

52-
**⚡️ Note**: If you're following the [Quickstart guide](https://github.com/buzzfeed/sso/blob/master/docs/quickstart.md), use `http://sso-auth.localtest.me/okta/callback` as the Authorized redirect URI.
52+
**⚡️ Note**: If you're following the [Quickstart guide](https://github.com/buzzfeed/sso/blob/main/docs/quickstart.md), use `http://sso-auth.localtest.me/okta/callback` as the Authorized redirect URI.
5353

5454
## 4. Finish configuring your Application
5555

@@ -66,8 +66,8 @@ and make sure `Refresh Token` is checked under 'Client acting on behalf of a use
6666
At the bottom of this same page you will see a section called 'Client Credentials' containing a `Client ID` and a `Client secret`.
6767
Copy both of these values to a safe and secure location - these are required to configure your `sso` deployment.
6868

69-
**⚡️Note:** If you're following the [Quickstart guide](https://github.com/buzzfeed/sso/blob/master/docs/quickstart.md), **stop here!**
70-
You'll add these credentials to `quickstart/env` as instructed in [the guide](https://github.com/buzzfeed/sso/blob/master/docs/quickstart.md).
69+
**⚡️Note:** If you're following the [Quickstart guide](https://github.com/buzzfeed/sso/blob/main/docs/quickstart.md), **stop here!**
70+
You'll add these credentials to `quickstart/env` as instructed in [the guide](https://github.com/buzzfeed/sso/blob/main/docs/quickstart.md).
7171

7272
### Assignments
7373

docs/sso_authenticator_config.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
We currently use environment variables to read configuration options, below is a list of environment variables and
33
their corresponding types that the sso authenticator will read.
44

5-
Defaults for the below settings can be found here: https://github.com/buzzfeed/sso/blob/master/internal/auth/configuration.go#L66-L117
5+
Defaults for the below settings can be found here: https://github.com/buzzfeed/sso/blob/main/internal/auth/configuration.go#L66-L117
66

77

88
## Session and Server configuration

docs/sso_config.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ export SSO_CONFIG_FOOBAR_SIGNING_KEY="sha256:shared-secret-value"
9999
```
100100
would be the signing key for the `foobar` upstream service, use the sha256 with the `shared-secret-value` as it's signing key value.
101101

102-
This signs the request using defined signature headers found in https://github.com/buzzfeed/sso/blob/master/sso_proxy/oauthproxy.go#L25.
102+
This signs the request using defined signature headers found in https://github.com/buzzfeed/sso/blob/main/sso_proxy/oauthproxy.go#L25.
103103
Specific implementation details can be found at https://github.com/18F/hmacauth
104104

105105
### Headers

0 commit comments

Comments
 (0)