Merge pull request #1136 from tdiary/switch-to-github-oauth-default

Use GitHub as default oauth provider

Author: hsbt

misc/paas/heroku/Gemfile.local

@@ -5,7 +5,7 @@ gem 'tdiary-contrib', git: 'https://github.com/tdiary/tdiary-contrib.git'
 gem 'tdiary-style-gfm'
 gem 'tdiary-style-rd'
 gem 'omniauth'
-gem 'omniauth-twitter'
+gem 'omniauth-github'
 gem 'dalli'
 gem 'rack-session'
 gem 'connection_pool'

misc/paas/heroku/Gemfile.lock

@@ -75,6 +75,8 @@ GEM
       rake
     jasmine-core (2.99.2)
     json (2.7.1)
+    jwt (2.8.0)
+      base64
     launchy (2.5.2)
       addressable (~> 2.8)
     mail (2.8.1)
@@ -95,6 +97,7 @@ GEM
       activemodel (>= 5.1, < 7.1, != 7.0.0)
       mongo (>= 2.10.5, < 3.0.0)
       ruby2_keywords (~> 0.0.5)
+    multi_xml (0.6.0)
     multipart-post (2.4.0)
     net-imap (0.4.10)
       date
@@ -110,25 +113,26 @@ GEM
       racc (~> 1.4)
     nokogiri (1.16.2-x86_64-linux)
       racc (~> 1.4)
-    oauth (1.1.0)
-      oauth-tty (~> 1.0, >= 1.0.1)
+    oauth2 (2.0.9)
+      faraday (>= 0.17.3, < 3.0)
+      jwt (>= 1.0, < 3.0)
+      multi_xml (~> 0.5)
+      rack (>= 1.2, < 4)
       snaky_hash (~> 2.0)
       version_gem (~> 1.1)
-    oauth-tty (1.0.5)
-      version_gem (~> 1.1, >= 1.1.1)
     octokit (4.22.0)
       faraday (>= 0.9)
       sawyer (~> 0.8.0, >= 0.5.3)
     omniauth (2.1.2)
       hashie (>= 3.4.6)
       rack (>= 2.2.3)
       rack-protection
-    omniauth-oauth (1.2.0)
-      oauth
-      omniauth (>= 1.0, < 3)
-    omniauth-twitter (1.4.0)
-      omniauth-oauth (~> 1.1)
-      rack
+    omniauth-github (2.0.1)
+      omniauth (~> 2.0)
+      omniauth-oauth2 (~> 1.8)
+    omniauth-oauth2 (1.8.0)
+      oauth2 (>= 1.4, < 3)
+      omniauth (~> 2.0)
     phantomjs (2.1.1.0)
     pit (0.0.7)
     power_assert (2.0.3)
@@ -251,7 +255,7 @@ DEPENDENCIES
   mime-types
   octokit
   omniauth
-  omniauth-twitter
+  omniauth-github
   pit
   puma
   rack (< 3)