Switch from Prototype to jQuery

[rails.git] / Gemfile.lock

diff --git a/Gemfile.lock b/Gemfile.lock
index c655845bb060d40fb315a2c85fa8af9ee3ed99fa..3343161f9531efc4da5d244daa4f12a9074f3c04 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -53,6 +53,9 @@ GEM
     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)
@@ -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)