Merge pull request #95 from BobbyMcWho/chores-2020-01-12

Allow for omniauth 2.0 series
omniauth · Jan 12, 2021 · 1f77226 · 1f77226
2 parents 5afe8ae + 7e5bcd8
commit 1f77226
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml
@@ -1,6 +1,10 @@
 name: Ruby
 
-on: [push]
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
 
 jobs:
   test:

diff --git a/lib/omniauth-github/version.rb b/lib/omniauth-github/version.rb
@@ -1,5 +1,5 @@
 module OmniAuth
   module GitHub
-    VERSION = "1.4.0"
+    VERSION = "2.0.0"
   end
 end
diff --git a/lib/omniauth/strategies/github.rb b/lib/omniauth/strategies/github.rb
@@ -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

diff --git a/omniauth-github.gemspec b/omniauth-github.gemspec
@@ -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'