Skip to content

Commit

Permalink
Use main instead of master
Browse files Browse the repository at this point in the history
  • Loading branch information
nbulaj committed Feb 18, 2021
1 parent ceeac7d commit c7c2c9c
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 22 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/check_orm_changes.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Check ORM changes
on:
push:
branches:
- master
- main
jobs:
check_orm_changes_and_notify:
name: Notify ORM extensions about required code updates
Expand All @@ -13,7 +13,7 @@ jobs:
env:
ISSUE_TITLE: "ORM requires update due to latest Doorkeeper changes"
ISSUE_BODY: |
Doorkeeper has ORM changes merged to `master` branch.
Doorkeeper has ORM changes merged to `main` branch.
See https://github.com/doorkeeper-gem/doorkeeper/commit/${{ github.sha }} for the details.
ISSUE_LABELS: ORM
Expand Down
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ gemfile:
- gemfiles/rails_5_2.gemfile
- gemfiles/rails_6_0.gemfile
- gemfiles/rails_6_1.gemfile
- gemfiles/rails_master.gemfile
- gemfiles/rails_main.gemfile

matrix:
fast_finish: true
Expand All @@ -30,5 +30,5 @@ matrix:
gemfile: gemfiles/rails_6_1.gemfile
arch: ppc64le
allow_failures:
- gemfile: gemfiles/rails_master.gemfile
- gemfile: gemfiles/rails_main.gemfile
- rvm: ruby-head
12 changes: 1 addition & 11 deletions Appraisals
Original file line number Diff line number Diff line change
@@ -1,15 +1,5 @@
# frozen_string_literal: true

appraise "rails-5-0" do
gem "rails", "~> 5.0.0"
gem "sqlite3", "~> 1.3", "< 1.4", platform: %i[ruby mswin mingw x64_mingw]
end

appraise "rails-5-1" do
gem "rails", "~> 5.1.0"
gem "sqlite3", "~> 1.3", "< 1.4", platform: %i[ruby mswin mingw x64_mingw]
end

appraise "rails-5-2" do
gem "rails", "~> 5.2.0"
gem "sqlite3", "~> 1.3", "< 1.4", platform: %i[ruby mswin mingw x64_mingw]
Expand All @@ -20,7 +10,7 @@ appraise "rails-6-0" do
gem "sqlite3", "~> 1.4", platform: %i[ruby mswin mingw x64_mingw]
end

appraise "rails-master" do
appraise "rails-main" do
gem "rails", git: "https://github.com/rails/rails"
gem "sqlite3", "~> 1.4", platform: %i[ruby mswin mingw x64_mingw]
end
2 changes: 1 addition & 1 deletion Dangerfile
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ Here's an example of a #{CHANGELOG_FILE} entry:
MARKDOWN

warn(
"Please include a changelog entry. \nYou can find it at [#{CHANGELOG_FILE}](#{GITHUB_REPO}/blob/master/#{CHANGELOG_FILE})." +
"Please include a changelog entry. \nYou can find it at [#{CHANGELOG_FILE}](#{GITHUB_REPO}/blob/main/#{CHANGELOG_FILE})." +
"You can skip this warning only if you made some typo fix or other small changes that didn't affect the API."
)
end
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# Doorkeeper — awesome OAuth 2 provider for your Rails / Grape app.

[![Gem Version](https://badge.fury.io/rb/doorkeeper.svg)](https://rubygems.org/gems/doorkeeper)
[![Build Status](https://travis-ci.org/doorkeeper-gem/doorkeeper.svg?branch=master)](https://travis-ci.org/doorkeeper-gem/doorkeeper)
[![Build Status](https://travis-ci.org/doorkeeper-gem/doorkeeper.svg?branch=main)](https://travis-ci.org/doorkeeper-gem/doorkeeper)
[![Code Climate](https://codeclimate.com/github/doorkeeper-gem/doorkeeper.svg)](https://codeclimate.com/github/doorkeeper-gem/doorkeeper)
[![Coverage Status](https://coveralls.io/repos/github/doorkeeper-gem/doorkeeper/badge.svg?branch=master)](https://coveralls.io/github/doorkeeper-gem/doorkeeper?branch=master)
[![Security](https://hakiri.io/github/doorkeeper-gem/doorkeeper/master.svg)](https://hakiri.io/github/doorkeeper-gem/doorkeeper/master)
[![Coverage Status](https://coveralls.io/repos/github/doorkeeper-gem/doorkeeper/badge.svg?branch=main)](https://coveralls.io/github/doorkeeper-gem/doorkeeper?branch=main)
[![Security](https://hakiri.io/github/doorkeeper-gem/doorkeeper/main.svg)](https://hakiri.io/github/doorkeeper-gem/doorkeeper/main)
[![Reviewed by Hound](https://img.shields.io/badge/Reviewed_by-Hound-8E64B0.svg)](https://houndci.com)
[![GuardRails badge](https://badges.guardrails.io/doorkeeper-gem/doorkeeper.svg?token=66768ce8f6995814df81f65a2cff40f739f688492704f973e62809e15599bb62)](https://dashboard.guardrails.io/default/gh/doorkeeper-gem/doorkeeper)
[![Dependabot](https://img.shields.io/badge/dependabot-enabled-success.svg)](https://dependabot.com)
Expand Down Expand Up @@ -51,7 +51,7 @@ Supported features:

## Documentation

This documentation is valid for `master` branch. Please check the documentation for the version of doorkeeper you are using in:
This documentation is valid for `main` branch. Please check the documentation for the version of doorkeeper you are using in:
https://github.com/doorkeeper-gem/doorkeeper/releases.

Additionally, other resources can be found on:
Expand Down
4 changes: 2 additions & 2 deletions doorkeeper.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ Gem::Specification.new do |gem|

gem.metadata = {
"homepage_uri" => "https://github.com/doorkeeper-gem/doorkeeper",
"changelog_uri" => "https://github.com/doorkeeper-gem/doorkeeper/blob/master/CHANGELOG.md",
"changelog_uri" => "https://github.com/doorkeeper-gem/doorkeeper/blob/main/CHANGELOG.md",
"source_code_uri" => "https://github.com/doorkeeper-gem/doorkeeper",
"bug_tracker_uri" => "https://github.com/doorkeeper-gem/doorkeeper/issues",
"documentation_uri" => "https://doorkeeper.gitbook.io/guides/",
Expand All @@ -34,7 +34,7 @@ Gem::Specification.new do |gem|
gem.required_ruby_version = ">= 2.4"

gem.post_install_message = <<~MSG.strip
Starting from 5.5.0.rc1 Doorkeeper requires client authentication for Resource Owner Password Grant
Starting from 5.5.0 RC1 Doorkeeper requires client authentication for Resource Owner Password Grant
as stated in the OAuth RFC. You have to create a new OAuth client (Doorkeeper::Application) if you didn't
have it before and use client credentials in HTTP Basic auth if you previously used this grant flow without
client authentication.
Expand Down
File renamed without changes.

0 comments on commit c7c2c9c

Please sign in to comment.