Skip to content

main branch references #511

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
anakinj merged 2 commits into from
Sep 11, 2022
Merged

main branch references #511

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1ada50a
main branch references
anakinj Sep 11, 2022
6d363c6
Removed a few obsolete SourceLevel config files
anakinj Sep 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
main branch references
  • Loading branch information
@anakinj
anakinj committed Sep 11, 2022
commit 1ada50afe480c077a20c902742db0f1241ccb925
2 changes: 1 addition & 1 deletion .github/workflows/coverage.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: coverage
on:
push:
branches:
- "master"
- "main"
jobs:
coverage:
name: coverage
Expand Down
14 changes: 7 additions & 7 deletions CONTRIBUTING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,19 @@ git remote add upstream https://github.com/jwt/ruby-jwt

## Create a branch for your implementation

Make sure you have the latest upstream master branch of the project.
Make sure you have the latest upstream main branch of the project.

```
git fetch --all
git checkout master
git rebase upstream/master
git push origin master
git checkout main
git rebase upstream/main
git push origin main
git checkout -b fix-a-little-problem
```

## Running the tests and linter

Before you start with your implementation make sure you are able to get a succesful test run with the current revision.
Before you start with your implementation make sure you are able to get a successful test run with the current revision.

The tests are written with rspec and [Appraisal](https://github.com/thoughtbot/appraisal) is used to ensure compatibility with 3rd party dependencies providing cryptographic features.

Expand Down Expand Up @@ -78,12 +78,12 @@ A maintainer will review and probably merge you changes when time allows, be pat

## Keeping your branch up-to-date

It's recommended that you keep your branch up-to-date by rebasing to the upstream master.
It's recommended that you keep your branch up-to-date by rebasing to the upstream main.

```
git fetch upstream
git checkout fix-a-little-problem
git rebase upstream/master
git rebase upstream/main
git push origin fix-a-little-problem -f
```

Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# JWT

[![Gem Version](https://badge.fury.io/rb/jwt.svg)](https://badge.fury.io/rb/jwt)
[![Build Status](https://github.com/jwt/ruby-jwt/workflows/test/badge.svg?branch=master)](https://github.com/jwt/ruby-jwt/actions)
[![Build Status](https://github.com/jwt/ruby-jwt/workflows/test/badge.svg?branch=main)](https://github.com/jwt/ruby-jwt/actions)
[![Code Climate](https://codeclimate.com/github/jwt/ruby-jwt/badges/gpa.svg)](https://codeclimate.com/github/jwt/ruby-jwt)
[![Test Coverage](https://codeclimate.com/github/jwt/ruby-jwt/badges/coverage.svg)](https://codeclimate.com/github/jwt/ruby-jwt/coverage)
[![Issue Count](https://codeclimate.com/github/jwt/ruby-jwt/badges/issue_count.svg)](https://codeclimate.com/github/jwt/ruby-jwt)
Expand Down