Commit 7e922d49

@@ -9,6 +9,7 @@ gem 'sqlite3-ruby', :require => 'sqlite3'
 gem 'devise'
 gem 'heroku'
 gem 'jquery-rails'
+gem 'omniauth'
 
 # Use unicorn as the web server
 # gem 'unicorn'

@@ -28,6 +28,7 @@ GEM
       activemodel (= 3.0.3)
       activesupport (= 3.0.3)
     activesupport (3.0.3)
+    addressable (2.2.5)
     arel (2.0.9)
     bcrypt-ruby (2.1.4)
     builder (2.1.2)
@@ -38,6 +39,10 @@ GEM
       warden (~> 1.0.3)
     erubis (2.6.6)
       abstract (>= 1.0.0)
+    faraday (0.6.1)
+      addressable (~> 2.2.4)
+      multipart-post (~> 1.1.0)
+      rack (< 2, >= 1.1.0)
     heroku (1.20.1)
       launchy (~> 0.3.2)
       rest-client (< 1.7.0, >= 1.4.0)
@@ -54,11 +59,58 @@ GEM
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.16)
+    multi_json (0.0.5)
+    multipart-post (1.1.0)
+    net-ldap (0.1.1)
+    nokogiri (1.4.4)
+    oa-basic (0.2.2)
+      multi_json (~> 0.0.2)
+      nokogiri (~> 1.4.2)
+      oa-core (= 0.2.2)
+      rest-client (~> 1.6.0)
+    oa-core (0.2.2)
+      rack (~> 1.1)
+    oa-enterprise (0.2.2)
+      net-ldap (~> 0.1.1)
+      nokogiri (~> 1.4.2)
+      oa-core (= 0.2.2)
+      pyu-ruby-sasl (~> 0.0.3.1)
+      rubyntlm (~> 0.1.1)
+    oa-more (0.2.2)
+      multi_json (~> 0.0.2)
+      oa-core (= 0.2.2)
+      rest-client (~> 1.6.0)
+    oa-oauth (0.2.2)
+      faraday (~> 0.6.1)
+      multi_json (~> 0.0.2)
+      nokogiri (~> 1.4.2)
+      oa-core (= 0.2.2)
+      oauth (~> 0.4.0)
+      oauth2 (~> 0.3.0)
+    oa-openid (0.2.2)
+      oa-core (= 0.2.2)
+      rack-openid (~> 1.2.0)
+      ruby-openid-apps-discovery
+    oauth (0.4.4)
+    oauth2 (0.3.0)
+      faraday (~> 0.6.0)
+      multi_json (~> 0.0.4)
+    omniauth (0.2.2)
+      oa-basic (= 0.2.2)
+      oa-core (= 0.2.2)
+      oa-enterprise (= 0.2.2)
+      oa-more (= 0.2.2)
+      oa-oauth (= 0.2.2)
+      oa-openid (= 0.2.2)
     orm_adapter (0.0.4)
     polyglot (0.3.1)
+    pyu-ruby-sasl (0.0.3.2)
     rack (1.2.2)
     rack-mount (0.6.14)
       rack (>= 1.0.0)
+    rack-openid (1.2.0)
+      rack (>= 1.1.0)
+      ruby-openid (>= 2.1.8)
     rack-test (0.5.7)
       rack (>= 1.0)
     rails (3.0.3)
@@ -77,6 +129,10 @@ GEM
     rake (0.8.7)
     rest-client (1.6.1)
       mime-types (>= 1.16)
+    ruby-openid (2.1.8)
+    ruby-openid-apps-discovery (1.2.0)
+      ruby-openid (>= 2.1.7)
+    rubyntlm (0.1.1)
     sqlite3 (1.3.3)
     sqlite3-ruby (1.3.3)
       sqlite3 (>= 1.3.3)
@@ -94,5 +150,6 @@ DEPENDENCIES
   devise
   heroku
   jquery-rails
+  omniauth
   rails (= 3.0.3)
   sqlite3-ruby