Regenerate bundle with latest bundler

[rails.git] / Gemfile.lock

diff --git a/Gemfile.lock b/Gemfile.lock
index c655845bb060d40fb315a2c85fa8af9ee3ed99fa..241e79e92c55e690484c9e7d966a3cb6336f8351 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -49,10 +49,13 @@ GEM
     faraday (0.7.5)
       addressable (~> 2.2.6)
       multipart-post (~> 1.1.3)
-      rack (< 2, >= 1.1.0)
+      rack (>= 1.1.0, < 2)
     hike (1.2.1)
     httpclient (2.2.3)
     i18n (0.6.0)
+    jquery-rails (1.0.18)
+      railties (~> 3.0)
+      thor (~> 0.14)
     json (1.6.1)
     libv8 (3.3.10.4)
     libxml-ruby (2.2.2)
@@ -79,8 +82,6 @@ GEM
       rack-openid (~> 1.3)
     pg (0.11.0)
     polyglot (0.3.3)
-    prototype-rails (3.1.0)
-      rails (~> 3.1)
     rack (1.3.5)
     rack-cache (1.1)
       rack (>= 0.4)
@@ -119,7 +120,7 @@ GEM
     rmagick (2.13.1)
     ruby-openid (2.1.8)
     sanitize (2.0.3)
-      nokogiri (< 1.6, >= 1.4.4)
+      nokogiri (>= 1.4.4, < 1.6)
     sass (3.1.10)
     sass-rails (3.1.5)
       actionpack (~> 3.1.0)
@@ -129,7 +130,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)
@@ -153,13 +154,13 @@ DEPENDENCIES
   composite_primary_keys (>= 4.1.1)
   dynamic_form
   httpclient
+  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)