X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/b52e5ef1cf8caa53d710c298952fd626adc1b51e..b91072bed4f06592110e747f1a04a13e270d852d:/Gemfile.lock

diff --git a/Gemfile.lock b/Gemfile.lock
index c655845bb..23c4297ab 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -39,21 +39,25 @@ GEM
     coffee-script (2.2.0)
       coffee-script-source
       execjs
-    coffee-script-source (1.1.3)
-    composite_primary_keys (4.1.1)
+    coffee-script-source (1.2.0)
+    composite_primary_keys (4.1.2)
       activerecord (~> 3.1)
     dynamic_form (1.1.4)
     erubis (2.7.0)
-    execjs (1.2.9)
+    execjs (1.3.0)
       multi_json (~> 1.0)
-    faraday (0.7.5)
-      addressable (~> 2.2.6)
-      multipart-post (~> 1.1.3)
-      rack (< 2, >= 1.1.0)
+    faraday (0.7.6)
+      addressable (~> 2.2)
+      multipart-post (~> 1.1)
+      rack (~> 1.1)
     hike (1.2.1)
-    httpclient (2.2.3)
+    httpclient (2.2.4)
     i18n (0.6.0)
-    json (1.6.1)
+    iconv (0.1)
+    jquery-rails (1.0.19)
+      railties (~> 3.0)
+      thor (~> 0.14)
+    json (1.6.5)
     libv8 (3.3.10.4)
     libxml-ruby (2.2.2)
     mail (2.3.0)
@@ -61,10 +65,10 @@ GEM
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     memcache-client (1.8.5)
-    memcached (1.3.5)
+    memcached (1.3.6)
     mime-types (1.17.2)
-    multi_json (1.0.3)
-    multipart-post (1.1.3)
+    multi_json (1.0.4)
+    multipart-post (1.1.4)
     nokogiri (1.5.0)
     oauth (0.4.5)
     oauth-plugin (0.4.0.rc2)
@@ -72,16 +76,14 @@ GEM
       oauth (~> 0.4.4)
       oauth2
       rack
-    oauth2 (0.5.1)
-      faraday (~> 0.7.4)
-      multi_json (~> 1.0.3)
+    oauth2 (0.5.2)
+      faraday (~> 0.7)
+      multi_json (~> 1.0)
     open_id_authentication (1.1.0)
       rack-openid (~> 1.3)
-    pg (0.11.0)
+    pg (0.12.2)
     polyglot (0.3.3)
-    prototype-rails (3.1.0)
-      rails (~> 3.1)
-    rack (1.3.5)
+    rack (1.3.6)
     rack-cache (1.1)
       rack (>= 0.4)
     rack-mount (0.8.3)
@@ -113,14 +115,14 @@ GEM
       rdoc (~> 3.4)
       thor (~> 0.14.6)
     rake (0.9.2.2)
-    rdoc (3.11)
+    rdoc (3.12)
       json (~> 1.4)
-    rinku (1.4.1)
+    rinku (1.5.0)
     rmagick (2.13.1)
     ruby-openid (2.1.8)
     sanitize (2.0.3)
-      nokogiri (< 1.6, >= 1.4.4)
-    sass (3.1.10)
+      nokogiri (>= 1.4.4, < 1.6)
+    sass (3.1.12)
     sass-rails (3.1.5)
       actionpack (~> 3.1.0)
       railties (~> 3.1.0)
@@ -129,7 +131,7 @@ GEM
     sprockets (2.0.3)
       hike (~> 1.2)
       rack (~> 1.0)
-      tilt (!= 1.3.0, ~> 1.1)
+      tilt (~> 1.1, != 1.3.0)
     therubyracer (0.9.9)
       libv8 (~> 3.3.10)
     thor (0.14.6)
@@ -139,7 +141,7 @@ GEM
       polyglot
       polyglot (>= 0.3.1)
     tzinfo (0.3.31)
-    uglifier (1.1.0)
+    uglifier (1.2.3)
       execjs (>= 0.3.0)
       multi_json (>= 1.0.2)
     validates_email_format_of (1.5.3)
@@ -150,16 +152,17 @@ PLATFORMS
 DEPENDENCIES
   SystemTimer (>= 1.1.3)
   coffee-rails (~> 3.1.0)
-  composite_primary_keys (>= 4.1.1)
+  composite_primary_keys (>= 4.1.2)
   dynamic_form
   httpclient
+  iconv
+  jquery-rails
   libxml-ruby (>= 2.0.5)
   memcache-client
   memcached
   oauth-plugin (>= 0.4.0.pre7)
   open_id_authentication (>= 1.1.0)
   pg
-  prototype-rails
   rails (= 3.1.3)
   rails-i18n-updater
   rinku (>= 1.2.2)