Fix server error when user#reset_password called with no token

[rails.git] / Gemfile.lock

diff --git a/Gemfile.lock b/Gemfile.lock
index 9c3460671861f88a24f92915565384737e78822f..27b5f5fa7df86eb81262e3fca1c60fefc8d59636 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -34,7 +34,7 @@ GEM
     builder (3.1.4)
     climate_control (0.0.3)
       activesupport (>= 3.0)
-    cocaine (0.5.1)
+    cocaine (0.5.2)
       climate_control (>= 0.0.3, < 1.0)
     coffee-rails (4.0.0)
       coffee-script (>= 2.2.0)
@@ -50,12 +50,12 @@ GEM
     dynamic_form (1.1.4)
     ejs (1.1.1)
     erubis (2.7.0)
-    execjs (2.0.1)
+    execjs (2.0.2)
     faraday (0.8.8)
       multipart-post (~> 1.2.0)
     hike (1.2.3)
     htmlentities (4.3.1)
-    http_accept_language (1.0.2)
+    http_accept_language (2.0.0)
     httpauth (0.2.0)
     httpclient (2.3.4.1)
     i18n (0.6.5)
@@ -79,7 +79,7 @@ GEM
     mime-types (1.25)
     mini_portile (0.5.1)
     minitest (4.7.5)
-    multi_json (1.8.0)
+    multi_json (1.8.1)
     multi_xml (0.5.5)
     multipart-post (1.2.0)
     nokogiri (1.6.0)
@@ -126,8 +126,9 @@ GEM
       bundler (>= 1.3.0, < 2.0)
       railties (= 4.0.0)
       sprockets-rails (~> 2.0.0)
-    rails-i18n (0.7.4)
-      i18n (~> 0.5)
+    rails-i18n (4.0.0)
+      i18n (~> 0.6)
+      rails (~> 4.0.0)
     railties (4.0.0)
       actionpack (= 4.0.0)
       activesupport (= 4.0.0)
@@ -139,7 +140,7 @@ GEM
     ruby-openid (2.3.0)
     sanitize (2.0.6)
       nokogiri (>= 1.4.4)
-    sass (3.2.10)
+    sass (3.2.12)
     sass-rails (4.0.0)
       railties (>= 4.0.0.beta, < 5.0)
       sass (>= 3.1.10)
@@ -182,7 +183,7 @@ DEPENDENCIES
   dynamic_form
   ejs
   htmlentities
-  http_accept_language (~> 1.0.2)
+  http_accept_language (~> 2.0.0)
   httpclient
   iconv (= 0.1)
   jquery-rails
@@ -200,7 +201,7 @@ DEPENDENCIES
   r2
   rack-cors
   rails (= 4.0.0)
-  rails-i18n (>= 0.6.3)
+  rails-i18n (~> 4.0.0)
   redcarpet
   rinku (>= 1.2.2)
   ruby-openid (>= 2.2.0)