Skip to content

Commit

Permalink
Rename from master to main
Browse files Browse the repository at this point in the history
  • Loading branch information
consideRatio committed Jan 10, 2022
1 parent 088dfe1 commit d11e8e2
Show file tree
Hide file tree
Showing 7 changed files with 15 additions and 20 deletions.
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Contributing

Welcome! As a [Jupyter](https://jupyter.org) project, we follow the [Jupyter contributor guide](https://jupyter.readthedocs.io/en/latest/contributor/content-contributor.html)
and [Code of Conduct](https://github.com/jupyter/governance/blob/master/conduct/code_of_conduct.md).
and [Code of Conduct](https://github.com/jupyter/governance/blob/HEAD/conduct/code_of_conduct.md).

To set up a development environment for this repository:

Expand Down
14 changes: 7 additions & 7 deletions RELEASE.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@ For you to follow along according to these instructions, you need:

## Steps to make a release

1. Checkout master and make sure it is up to date.
1. Checkout main and make sure it is up to date.

```shell
ORIGIN=${ORIGIN:-origin} # set to the canonical remote, e.g. 'upstream' if 'origin' is not the official repo
git checkout master
git fetch $ORIGIN master
git reset --hard $ORIGIN/master
git checkout main
git fetch $ORIGIN main
git reset --hard $ORIGIN/main
# WARNING! This next command deletes any untracked files in the repo
git clean -xfd
```
Expand Down Expand Up @@ -47,15 +47,15 @@ For you to follow along according to these instructions, you need:
git commit -m "back to dev"
```

1. Push your two commits to master.
1. Push your two commits to main.

```shell
# first push commits without a tags to ensure the
# commits comes through, because a tag can otherwise
# be pushed all alone without company of rejected
# commits, and we want have our tagged release coupled
# with a specific commit in master
git push $ORIGIN master
# with a specific commit in main
git push $ORIGIN main
```

1. Create a git tag for the pushed release commit and push it.
Expand Down
2 changes: 1 addition & 1 deletion docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
copyright = 'Jupyter Contributors'
author = 'Jupyter Contributors'

master_doc = 'index'
root_doc = master_doc = 'index'

import oauthenticator

Expand Down
8 changes: 4 additions & 4 deletions docs/source/getting-started.rst
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ This sample code is provided for you in ``examples > azuread > sample_jupyter_co

- See ``run.sh`` for an `example <./examples/azuread/>`__

- `Source Code <https://github.com/jupyterhub/oauthenticator/blob/master/oauthenticator/azuread.py>`__
- `Source Code <https://github.com/jupyterhub/oauthenticator/blob/HEAD/oauthenticator/azuread.py>`__


GitHub Setup
Expand Down Expand Up @@ -415,7 +415,7 @@ Globus Scopes and Transfer
~~~~~~~~~~~~~~~~~~~~~~~~~~

The following shows how to get tokens into user Notebooks. `You can see how users
use tokens here <https://github.com/globus/globus-jupyter-notebooks/blob/master/JupyterHub_Integration.ipynb>`__.
use tokens here <https://github.com/globus/globus-jupyter-notebooks/blob/HEAD/JupyterHub_Integration.ipynb>`__.
If you want a demonstration, you can visit `The Jupyter Globus Demo Server <https://jupyter.demo.globus.org>`__.

The default server configuration will automatically setup user environments
Expand Down Expand Up @@ -584,9 +584,9 @@ Examples
--------

For an example docker image using OAuthenticator, see the
`examples <https://github.com/jupyterhub/oauthenticator/tree/master/examples>`__ directory.
`examples <https://github.com/jupyterhub/oauthenticator/tree/HEAD/examples>`__ directory.

`Another
example <https://github.com/jupyterhub/dockerspawner/tree/master/examples/oauth>`__
example <https://github.com/jupyterhub/dockerspawner/tree/HEAD/examples/oauth>`__
is using GitHub OAuth to spawn each user’s server in a separate docker
container.
5 changes: 0 additions & 5 deletions docs/source/index.rst
Original file line number Diff line number Diff line change
@@ -1,8 +1,3 @@
.. OAuthenticator documentation master file, created by
sphinx-quickstart on Tue Dec 3 10:38:44 2019.
You can adapt this file completely to your liking, but it should at least
contain the root `toctree` directive.
==============
OAuthenticator
==============
Expand Down
2 changes: 1 addition & 1 deletion oauthenticator/gitlab.py
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ async def authenticate(self, handler, data=None):

# Exchange the OAuth code for a GitLab Access Token
#
# See: https://github.com/gitlabhq/gitlabhq/blob/master/doc/api/oauth2.md
# See: https://github.com/gitlabhq/gitlabhq/blob/HEAD/doc/api/oauth2.md

# GitLab specifies a POST request yet requires URL parameters
params = dict(
Expand Down
2 changes: 1 addition & 1 deletion oauthenticator/globus.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ async def get(self):
# Ensure self.handle_logout() is called before self.default_handle_logout()
# If default_handle_logout() is called first, the user session is popped and
# it's not longer possible to call get_auth_state() to revoke tokens.
# See https://github.com/jupyterhub/jupyterhub/blob/master/jupyterhub/handlers/login.py # noqa
# See https://github.com/jupyterhub/jupyterhub/blob/HEAD/jupyterhub/handlers/login.py # noqa
await self.handle_logout()
await self.default_handle_logout()
if self.authenticator.logout_redirect_url:
Expand Down

0 comments on commit d11e8e2

Please sign in to comment.