Merge 3248e79 into cd83561

Gemfile.lock

@@ -1,14 +1,14 @@
 GIT
   remote: git://github.com/intridea/omniauth-identity.git
-  revision: 11f0395d9fed03b13f8f528b18eb54235b0d8acd
+  revision: 005571f6b3a9c3a857c98f7a1e6528073123e092
   specs:
-    omniauth-identity (1.1.0)
+    omniauth-identity (1.1.1)
       bcrypt-ruby (~> 3.0)
       omniauth (~> 1.0)
 
 GIT
   remote: git://github.com/rails/rails.git
-  revision: 996f9b5873e80cfc2255b4e28755165fc8e55d83
+  revision: 69339e54d3464c6e4193ce744f975fd52b348449
   specs:
     actionmailer (4.1.0.beta)
       actionpack (= 4.1.0.beta)
@@ -56,7 +56,7 @@ GEM
   specs:
     arel (4.0.0)
     atomic (1.1.10)
-    authority (2.6.0)
+    authority (2.7.0)
       activesupport (>= 3.0.0)
       rake (>= 0.8.7)
     bcrypt-ruby (3.0.1)
@@ -73,7 +73,7 @@ GEM
     coffee-script (2.2.0)
       coffee-script-source
       execjs
-    coffee-script-source (1.6.2)
+    coffee-script-source (1.6.3)
     colorize (0.5.8)
     coveralls (0.6.7)
       colorize
@@ -99,32 +99,32 @@ GEM
     hashie (2.0.5)
     hike (1.2.3)
     i18n (0.6.4)
-    jbuilder (1.4.2)
+    jbuilder (1.5.0)
       activesupport (>= 3.0.0)
       multi_json (>= 1.2.0)
-    jquery-rails (3.0.1)
+    jquery-rails (3.0.4)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
     json (1.8.0)
     mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    method_source (0.8.1)
+    method_source (0.8.2)
     mime-types (1.23)
     minitest (5.0.6)
     multi_json (1.7.7)
     omniauth (1.1.4)
       hashie (>= 1.2, < 3)
       rack
-    pg (0.15.1)
+    pg (0.16.0)
     polyglot (0.3.3)
     pry (0.9.12.2)
       coderay (~> 1.0.5)
       method_source (~> 0.8)
       slop (~> 3.4)
-    pry-rails (0.3.1)
+    pry-rails (0.3.2)
       pry (>= 0.9.10)
-    puma (2.1.1)
+    puma (2.4.0)
       rack (>= 1.1, < 2.0)
     rack (1.5.2)
     rack-test (0.6.2)
@@ -133,18 +133,18 @@ GEM
     rest-client (1.6.7)
       mime-types (>= 1.16)
     rolify (3.2.0)
-    rspec-core (2.14.0.rc1)
-    rspec-expectations (2.14.0.rc1)
+    rspec-core (2.14.4)
+    rspec-expectations (2.14.0)
       diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.0.rc1)
-    rspec-rails (2.14.0.rc1)
+    rspec-mocks (2.14.2)
+    rspec-rails (2.14.0)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
-      rspec-core (= 2.14.0.rc1)
-      rspec-expectations (= 2.14.0.rc1)
-      rspec-mocks (= 2.14.0.rc1)
-    sass (3.2.9)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    sass (3.2.10)
     sass-rails (4.0.0)
       railties (>= 4.0.0.beta, < 5.0)
       sass (>= 3.1.10)
@@ -153,7 +153,7 @@ GEM
       multi_json (~> 1.0)
       simplecov-html (~> 0.7.1)
     simplecov-html (0.7.1)
-    slop (3.4.5)
+    slop (3.4.6)
     spring (0.0.10)
     sprockets (2.10.0)
       hike (~> 1.2)
@@ -165,16 +165,16 @@ GEM
       activesupport (>= 3.0)
       sprockets (~> 2.8)
     thor (0.18.1)
-    thread_safe (0.1.0)
+    thread_safe (0.1.2)
       atomic
     tilt (1.4.1)
     treetop (1.4.14)
       polyglot
       polyglot (>= 0.3.1)
-    turbolinks (1.2.0)
+    turbolinks (1.3.0)
       coffee-rails
     tzinfo (0.3.37)
-    uglifier (2.1.1)
+    uglifier (2.1.2)
       execjs (>= 0.3.0)
       multi_json (~> 1.0, >= 1.0.2)