Skip to content

Commit

Permalink
Merge pull request #95 from BobbyMcWho/chores-2020-01-12
Browse files Browse the repository at this point in the history
Allow for omniauth 2.0 series
  • Loading branch information
BobbyMcWho authored Jan 12, 2021
2 parents 5afe8ae + 7e5bcd8 commit 1f77226
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 5 deletions.
6 changes: 5 additions & 1 deletion .github/workflows/ruby.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
name: Ruby

on: [push]
on:
push:
branches: [ master ]
pull_request:
branches: [ master ]

jobs:
test:
Expand Down
2 changes: 1 addition & 1 deletion lib/omniauth-github/version.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module OmniAuth
module GitHub
VERSION = "1.4.0"
VERSION = "2.0.0"
end
end
2 changes: 1 addition & 1 deletion lib/omniauth/strategies/github.rb
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ def email_access_allowed?
end

def callback_url
full_host + script_name + callback_path
full_host + callback_path
end
end
end
Expand Down
4 changes: 2 additions & 2 deletions omniauth-github.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ Gem::Specification.new do |gem|
gem.require_paths = ["lib"]
gem.version = OmniAuth::GitHub::VERSION

gem.add_dependency 'omniauth', '~> 1.5'
gem.add_dependency 'omniauth-oauth2', '>= 1.4.0', '< 2.0'
gem.add_dependency 'omniauth', '~> 2.0'
gem.add_dependency 'omniauth-oauth2', '~> 1.7.1'
gem.add_development_dependency 'rspec', '~> 3.5'
gem.add_development_dependency 'rack-test'
gem.add_development_dependency 'simplecov'
Expand Down

0 comments on commit 1f77226

Please sign in to comment.