Updated Gemfile.lock with rails 3.1

michelson · Nov 9, 2011 · a3a5f22 · a3a5f22
1 parent 46ffce5
commit a3a5f22
Show file tree

Hide file tree

Showing 3 changed files with 59 additions and 79 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -4,55 +4,6 @@ GIT
   specs:
     rack (1.2.1)
 
-GIT
-  remote: git://github.com/rails/rails.git
-  revision: 2fbbd08616c25dc2931eca914349dd2161766f69
-  specs:
-    actionmailer (3.1.0.beta)
-      actionpack (= 3.1.0.beta)
-      mail (~> 2.3.0)
-    actionpack (3.1.0.beta)
-      activemodel (= 3.1.0.beta)
-      activesupport (= 3.1.0.beta)
-      builder (~> 3.0.0)
-      erubis (~> 2.7.0)
-      i18n (~> 0.6.0beta1)
-      rack (~> 1.2.1)
-      rack-cache (~> 1.0.0)
-      rack-mount (~> 0.7.2)
-      rack-test (~> 0.5.7)
-      sprockets (~> 2.0.0.beta.2)
-      tzinfo (~> 0.3.23)
-    activemodel (3.1.0.beta)
-      activesupport (= 3.1.0.beta)
-      bcrypt-ruby (~> 2.1.4)
-      builder (~> 3.0.0)
-      i18n (~> 0.6.0beta1)
-    activerecord (3.1.0.beta)
-      activemodel (= 3.1.0.beta)
-      activesupport (= 3.1.0.beta)
-      arel (~> 2.1.0)
-      tzinfo (~> 0.3.23)
-    activeresource (3.1.0.beta)
-      activemodel (= 3.1.0.beta)
-      activesupport (= 3.1.0.beta)
-    activesupport (3.1.0.beta)
-      multi_json (~> 1.0.0)
-    rails (3.1.0.beta)
-      actionmailer (= 3.1.0.beta)
-      actionpack (= 3.1.0.beta)
-      activerecord (= 3.1.0.beta)
-      activeresource (= 3.1.0.beta)
-      activesupport (= 3.1.0.beta)
-      bundler (~> 1.0)
-      railties (= 3.1.0.beta)
-    railties (3.1.0.beta)
-      actionpack (= 3.1.0.beta)
-      activesupport (= 3.1.0.beta)
-      rack-ssl (~> 1.3.2)
-      rake (>= 0.8.7)
-      thor (~> 0.14.4)
-
 GIT
   remote: git://github.com/sstephenson/sprockets.git
   revision: c4800417792744c11eb1fb888bbe9a3a82859952
@@ -65,46 +16,77 @@ GIT
 PATH
   remote: .
   specs:
-    jquery-rails (0.3)
-      rails (~> 3.1)
-      thor (~> 0.14.4)
+    jquery-rails (1.0.16)
+      railties (~> 3.0)
+      thor (~> 0.14)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    addressable (2.2.4)
-    arel (2.1.0)
-    bcrypt-ruby (2.1.4)
-    builder (3.0.0)
-    crack (0.1.8)
-    erubis (2.7.0)
+    abstract (1.0.0)
+    actionmailer (3.0.5)
+      actionpack (= 3.0.5)
+      mail (~> 2.2.15)
+    actionpack (3.0.5)
+      activemodel (= 3.0.5)
+      activesupport (= 3.0.5)
+      builder (~> 2.1.2)
+      erubis (~> 2.6.6)
+      i18n (~> 0.4)
+      rack (~> 1.2.1)
+      rack-mount (~> 0.6.13)
+      rack-test (~> 0.5.7)
+      tzinfo (~> 0.3.23)
+    activemodel (3.0.5)
+      activesupport (= 3.0.5)
+      builder (~> 2.1.2)
+      i18n (~> 0.4)
+    activerecord (3.0.5)
+      activemodel (= 3.0.5)
+      activesupport (= 3.0.5)
+      arel (~> 2.0.2)
+      tzinfo (~> 0.3.23)
+    activeresource (3.0.5)
+      activemodel (= 3.0.5)
+      activesupport (= 3.0.5)
+    activesupport (3.0.5)
+    arel (2.0.10)
+    builder (2.1.2)
+    erubis (2.6.6)
+      abstract (>= 1.0.0)
     hike (1.0.0)
     i18n (0.6.0beta1)
-    mail (2.3.0)
+    mail (2.2.19)
+      activesupport (>= 2.3.6)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.16)
-    multi_json (1.0.0)
-    polyglot (0.3.1)
-    rack-cache (1.0.1)
-      rack (>= 0.4)
-    rack-mount (0.7.2)
+    mime-types (1.17.2)
+    polyglot (0.3.3)
+    rack-mount (0.6.14)
       rack (>= 1.0.0)
-    rack-ssl (1.3.2)
-      rack
     rack-test (0.5.7)
       rack (>= 1.0)
-    rake (0.8.7)
-    rspec (1.3.1)
+    rails (3.0.5)
+      actionmailer (= 3.0.5)
+      actionpack (= 3.0.5)
+      activerecord (= 3.0.5)
+      activeresource (= 3.0.5)
+      activesupport (= 3.0.5)
+      bundler (~> 1.0)
+      railties (= 3.0.5)
+    railties (3.0.5)
+      actionpack (= 3.0.5)
+      activesupport (= 3.0.5)
+      rake (>= 0.8.7)
+      thor (~> 0.14.4)
+    rake (0.9.2.2)
     thor (0.14.6)
     tilt (1.3)
-    treetop (1.4.9)
+    treetop (1.4.10)
+      polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.27)
-    webmock (1.6.2)
-      addressable (>= 2.2.2)
-      crack (>= 0.1.7)
+    tzinfo (0.3.31)
 
 PLATFORMS
   ruby
@@ -114,7 +96,5 @@ DEPENDENCIES
   i18n (= 0.6.0beta1)
   jquery-rails!
   rack!
-  rails!
-  rspec (~> 1.3)
+  rails (~> 3.0)
   sprockets!
-  webmock (~> 1.6.2)
diff --git a/vendor/assets/javascripts/jquery.js b/vendor/assets/javascripts/jquery.js
@@ -9297,4 +9297,4 @@ jQuery.each([ "Height", "Width" ], function( i, name ) {
 
 // Expose jQuery to the global object
 window.jQuery = window.$ = jQuery;
-})( window );
+})( window );