Skip to content

Commit 1f77226

Browse files
authored
Merge pull request #95 from BobbyMcWho/chores-2020-01-12
Allow for omniauth 2.0 series
2 parents 5afe8ae + 7e5bcd8 commit 1f77226

File tree

4 files changed

+9
-5
lines changed

4 files changed

+9
-5
lines changed

.github/workflows/ruby.yml

+5-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
name: Ruby
22

3-
on: [push]
3+
on:
4+
push:
5+
branches: [ master ]
6+
pull_request:
7+
branches: [ master ]
48

59
jobs:
610
test:

lib/omniauth-github/version.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
module OmniAuth
22
module GitHub
3-
VERSION = "1.4.0"
3+
VERSION = "2.0.0"
44
end
55
end

lib/omniauth/strategies/github.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ def email_access_allowed?
7575
end
7676

7777
def callback_url
78-
full_host + script_name + callback_path
78+
full_host + callback_path
7979
end
8080
end
8181
end

omniauth-github.gemspec

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ Gem::Specification.new do |gem|
1616
gem.require_paths = ["lib"]
1717
gem.version = OmniAuth::GitHub::VERSION
1818

19-
gem.add_dependency 'omniauth', '~> 1.5'
20-
gem.add_dependency 'omniauth-oauth2', '>= 1.4.0', '< 2.0'
19+
gem.add_dependency 'omniauth', '~> 2.0'
20+
gem.add_dependency 'omniauth-oauth2', '~> 1.7.1'
2121
gem.add_development_dependency 'rspec', '~> 3.5'
2222
gem.add_development_dependency 'rack-test'
2323
gem.add_development_dependency 'simplecov'

0 commit comments

Comments
 (0)