Merge branch 'development'

ASCTech · Feb 8, 2016 · 4e17c42 · 4e17c42
2 parents 23719ea + 3e5dd5c
commit 4e17c42
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/Gemfile b/Gemfile
@@ -21,6 +21,7 @@ gem 'devise'
 gem 'omniauth'
 gem 'omniauth-oauth'
 gem 'omniauth-openid'
+gem 'omniauth-google-oauth2'
 
 # use Nokogiri to parse the exercise files
 gem 'nokogiri'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -116,9 +116,15 @@ GEM
     omniauth (1.1.1)
       hashie (~> 1.2)
       rack
+    omniauth-google-oauth2 (0.2.6)
+      omniauth (> 1.0)
+      omniauth-oauth2 (~> 1.1)
     omniauth-oauth (1.0.1)
       oauth
       omniauth (~> 1.0)
+    omniauth-oauth2 (1.1.1)
+      oauth2 (~> 0.8.0)
+      omniauth (~> 1.0)
     omniauth-openid (1.0.1)
       omniauth (~> 1.0)
       rack-openid (~> 1.3.1)
@@ -218,6 +224,7 @@ DEPENDENCIES
   nokogiri
   oauth-plugin (~> 0.4.0)
   omniauth
+  omniauth-google-oauth2
   omniauth-oauth
   omniauth-openid
   piwik_analytics (~> 1.0.1)

diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb
@@ -210,7 +210,7 @@
   config.omniauth :coursera, 'db127b155312155233e6e5da331adfed38f96e4f', 'f4e61cf7794c5c703b8aa714d6cc4acca42c76ee'
   config.omniauth :open_id, :name => 'google', :identifier => 'https://www.google.com/accounts/o8/id'
 
-  # require "omniauth-google-oauth2"
+  require "omniauth-google-oauth2"
   config.omniauth :google_oauth2, "477602199932-a5mnlh3q1qahk52eds3c0c3f0i4ogvd9.apps.googleusercontent.com", "1Leg_PS13r3NGybWmDEXaGYH"
 
 #, { access_type: "offline", approval_prompt: "" }