X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/ea63736b5c1b6e1d1adbf043f025cc9cb4171bcb..4d91fe3dd95c1058cb8d24fd4c900223e30b9059:/Gemfile.lock

diff --git a/Gemfile.lock b/Gemfile.lock
index 158694564..666b6a094 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -31,9 +31,8 @@ GEM
       multi_json (~> 1.0)
     arel (3.0.2)
     bigdecimal (1.1.0)
-    browser (0.1.4)
-    builder (3.0.0)
-    cocaine (0.2.1)
+    builder (3.0.3)
+    cocaine (0.3.0)
     coffee-rails (3.2.2)
       coffee-script (>= 2.2.0)
       railties (~> 3.2.0)
@@ -55,10 +54,12 @@ GEM
     http_accept_language (1.0.2)
     httpauth (0.1)
     httpclient (2.2.7)
-    i18n (0.6.0)
+    i18n (0.6.1)
+    i18n-js (3.0.0.rc2)
+      i18n
     iconv (0.1)
     journey (1.0.4)
-    jquery-rails (2.1.1)
+    jquery-rails (2.1.2)
       railties (>= 3.1.0, < 5.0)
       thor (~> 0.14)
     json (1.7.5)
@@ -75,13 +76,13 @@ GEM
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    memcached (1.4.3)
+    memcached (1.4.5)
     mime-types (1.19)
-    minitest (3.3.0)
+    minitest (3.4.0)
     multi_json (1.3.6)
     multipart-post (1.1.5)
     nokogiri (1.5.5)
-    oauth (0.4.6)
+    oauth (0.4.7)
     oauth-plugin (0.4.1)
       multi_json
       oauth (~> 0.4.4)
@@ -100,7 +101,7 @@ GEM
       activesupport (>= 2.3.2)
       cocaine (>= 0.0.2)
       mime-types
-    pg (0.14.0)
+    pg (0.14.1)
     polyglot (0.3.3)
     rack (1.4.1)
     rack-cache (1.2)
@@ -120,7 +121,7 @@ GEM
       activesupport (= 3.2.8)
       bundler (~> 1.0)
       railties (= 3.2.8)
-    rails-i18n (0.6.5)
+    rails-i18n (0.6.6)
       i18n (~> 0.5)
     railties (3.2.8)
       actionpack (= 3.2.8)
@@ -150,14 +151,14 @@ GEM
       libv8 (~> 3.3.10)
     thor (0.16.0)
     tilt (1.3.3)
-    timecop (0.4.5)
+    timecop (0.5.1)
     treetop (1.4.10)
       polyglot
       polyglot (>= 0.3.1)
     tzinfo (0.3.33)
-    uglifier (1.2.7)
+    uglifier (1.3.0)
       execjs (>= 0.3.0)
-      multi_json (~> 1.3)
+      multi_json (~> 1.0, >= 1.0.2)
     validates_email_format_of (1.5.3)
 
 PLATFORMS
@@ -166,7 +167,6 @@ PLATFORMS
 DEPENDENCIES
   SystemTimer (>= 1.1.3)
   bigdecimal
-  browser
   coffee-rails (~> 3.2.1)
   composite_primary_keys (>= 5.0.8)
   deadlock_retry (>= 1.2.0)
@@ -174,6 +174,7 @@ DEPENDENCIES
   htmlentities
   http_accept_language (>= 1.0.2)
   httpclient
+  i18n-js (>= 3.0.0.rc2)
   iconv
   jquery-rails
   jsonify-rails