Update to Rails 3.1.1.rc2

romul · Sep 30, 2011 · fe21b3e · fe21b3e
1 parent 2245962
commit fe21b3e
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 30 deletions.
diff --git a/Gemfile b/Gemfile
@@ -1,7 +1,5 @@
 source 'http://rubygems.org'
 
-gem 'rails', '3.1.1.rc1'
-
 gem 'json'
 gem 'sqlite3'
 # Gems used only for assets and not required

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -26,7 +26,7 @@ PATH
       meta_search (= 1.1.1)
       nested_set (= 1.6.8)
       paperclip (= 2.4.1)
-      rails (= 3.1.1.rc1)
+      rails (= 3.1.1.rc2)
       rd_find_by_param (= 0.1.1)
       rd_resource_controller
       state_machine (= 1.0.1)
@@ -42,12 +42,12 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (3.1.1.rc1)
-      actionpack (= 3.1.1.rc1)
+    actionmailer (3.1.1.rc2)
+      actionpack (= 3.1.1.rc2)
       mail (~> 2.3.0)
-    actionpack (3.1.1.rc1)
-      activemodel (= 3.1.1.rc1)
-      activesupport (= 3.1.1.rc1)
+    actionpack (3.1.1.rc2)
+      activemodel (= 3.1.1.rc2)
+      activesupport (= 3.1.1.rc2)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       i18n (~> 0.6)
@@ -61,19 +61,19 @@ GEM
       braintree (>= 2.0.0)
       builder (>= 2.0.0)
       json (>= 1.5.1)
-    activemodel (3.1.1.rc1)
-      activesupport (= 3.1.1.rc1)
+    activemodel (3.1.1.rc2)
+      activesupport (= 3.1.1.rc2)
       builder (~> 3.0.0)
       i18n (~> 0.6)
-    activerecord (3.1.1.rc1)
-      activemodel (= 3.1.1.rc1)
-      activesupport (= 3.1.1.rc1)
+    activerecord (3.1.1.rc2)
+      activemodel (= 3.1.1.rc2)
+      activesupport (= 3.1.1.rc2)
       arel (~> 2.2.1)
       tzinfo (~> 0.3.29)
-    activeresource (3.1.1.rc1)
-      activemodel (= 3.1.1.rc1)
-      activesupport (= 3.1.1.rc1)
-    activesupport (3.1.1.rc1)
+    activeresource (3.1.1.rc2)
+      activemodel (= 3.1.1.rc2)
+      activesupport (= 3.1.1.rc2)
+    activesupport (3.1.1.rc2)
       multi_json (~> 1.0)
     acts_as_list (0.1.4)
     addressable (2.2.6)
@@ -181,17 +181,17 @@ GEM
       rack
     rack-test (0.6.1)
       rack (>= 1.0)
-    rails (3.1.1.rc1)
-      actionmailer (= 3.1.1.rc1)
-      actionpack (= 3.1.1.rc1)
-      activerecord (= 3.1.1.rc1)
-      activeresource (= 3.1.1.rc1)
-      activesupport (= 3.1.1.rc1)
+    rails (3.1.1.rc2)
+      actionmailer (= 3.1.1.rc2)
+      actionpack (= 3.1.1.rc2)
+      activerecord (= 3.1.1.rc2)
+      activeresource (= 3.1.1.rc2)
+      activesupport (= 3.1.1.rc2)
       bundler (~> 1.0)
-      railties (= 3.1.1.rc1)
-    railties (3.1.1.rc1)
-      actionpack (= 3.1.1.rc1)
-      activesupport (= 3.1.1.rc1)
+      railties (= 3.1.1.rc2)
+    railties (3.1.1.rc2)
+      actionpack (= 3.1.1.rc2)
+      activesupport (= 3.1.1.rc2)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
@@ -253,7 +253,7 @@ GEM
     treetop (1.4.10)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.29)
+    tzinfo (0.3.30)
     uglifier (1.0.3)
       execjs (>= 0.3.0)
       multi_json (>= 1.0.2)
@@ -277,7 +277,6 @@ DEPENDENCIES
   launchy
   mysql2 (~> 0.3.6)
   nokogiri
-  rails (= 3.1.1.rc1)
   rcov
   rspec-rails (= 2.6.1)
   ruby-debug

diff --git a/core/spree_core.gemspec b/core/spree_core.gemspec
@@ -31,7 +31,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'rd_resource_controller'
   s.add_dependency 'meta_search', '= 1.1.1'
   s.add_dependency 'activemerchant', '= 1.17.0'
-  s.add_dependency 'rails', '= 3.1.1.rc1'
+  s.add_dependency 'rails', '= 3.1.1.rc2'
   s.add_dependency 'kaminari', '>= 0.12.4'
   s.add_dependency 'deface', '>= 0.6.1'
 end