Update to Rails 3.2.6

dradis · Jun 21, 2012 · ac93c76 · ac93c76
1 parent 115d6d1
commit ac93c76
Show file tree

Hide file tree

Showing 24 changed files with 33 additions and 31 deletions.
diff --git a/Gemfile b/Gemfile
@@ -1,6 +1,6 @@
 source 'http://rubygems.org'
 
-gem 'rails', '3.2.3'
+gem 'rails', '3.2.6'
 
 # Gems used only for assets and not required
 # in production environments by default.

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -2,31 +2,31 @@ GEM
   remote: http://rubygems.org/
   specs:
     RedCloth (4.2.9)
-    actionmailer (3.2.3)
-      actionpack (= 3.2.3)
+    actionmailer (3.2.6)
+      actionpack (= 3.2.6)
       mail (~> 2.4.4)
-    actionpack (3.2.3)
-      activemodel (= 3.2.3)
-      activesupport (= 3.2.3)
+    actionpack (3.2.6)
+      activemodel (= 3.2.6)
+      activesupport (= 3.2.6)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       journey (~> 1.0.1)
       rack (~> 1.4.0)
       rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
-      sprockets (~> 2.1.2)
-    activemodel (3.2.3)
-      activesupport (= 3.2.3)
+      sprockets (~> 2.1.3)
+    activemodel (3.2.6)
+      activesupport (= 3.2.6)
       builder (~> 3.0.0)
-    activerecord (3.2.3)
-      activemodel (= 3.2.3)
-      activesupport (= 3.2.3)
+    activerecord (3.2.6)
+      activemodel (= 3.2.6)
+      activesupport (= 3.2.6)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activeresource (3.2.3)
-      activemodel (= 3.2.3)
-      activesupport (= 3.2.3)
-    activesupport (3.2.3)
+    activeresource (3.2.6)
+      activemodel (= 3.2.6)
+      activesupport (= 3.2.6)
+    activesupport (3.2.6)
       i18n (~> 0.6)
       multi_json (~> 1.0)
     arel (3.0.2)
@@ -47,6 +47,7 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.2.0)
+    database_cleaner (0.8.0)
     diff-lcs (1.1.3)
     env (0.2.0)
     erubis (2.7.0)
@@ -61,7 +62,7 @@ GEM
       guard (>= 0.8.4)
     hike (1.2.1)
     i18n (0.6.0)
-    journey (1.0.3)
+    journey (1.0.4)
     jquery-fileupload-rails (0.3.0)
       actionpack (>= 3.1)
       railties (>= 3.1)
@@ -74,8 +75,8 @@ GEM
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.18)
-    multi_json (1.3.5)
+    mime-types (1.19)
+    multi_json (1.3.6)
     nokogiri (1.5.2)
     polyglot (0.3.3)
     rack (1.4.1)
@@ -85,21 +86,21 @@ GEM
       rack
     rack-test (0.6.1)
       rack (>= 1.0)
-    rails (3.2.3)
-      actionmailer (= 3.2.3)
-      actionpack (= 3.2.3)
-      activerecord (= 3.2.3)
-      activeresource (= 3.2.3)
-      activesupport (= 3.2.3)
+    rails (3.2.6)
+      actionmailer (= 3.2.6)
+      actionpack (= 3.2.6)
+      activerecord (= 3.2.6)
+      activeresource (= 3.2.6)
+      activesupport (= 3.2.6)
       bundler (~> 1.0)
-      railties (= 3.2.3)
-    railties (3.2.3)
-      actionpack (= 3.2.3)
-      activesupport (= 3.2.3)
+      railties (= 3.2.6)
+    railties (3.2.6)
+      actionpack (= 3.2.6)
+      activesupport (= 3.2.6)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
-      thor (~> 0.14.6)
+      thor (>= 0.14.6, < 2.0)
     rake (0.9.2.2)
     rdoc (3.12)
       json (~> 1.4)
@@ -159,13 +160,14 @@ DEPENDENCIES
   builder
   capybara
   coffee-rails (~> 3.2.1)
+  database_cleaner
   execjs
   factory_girl (~> 2.6.4)
   guard-rspec
   jquery-fileupload-rails
   jquery-rails
   nokogiri
-  rails (= 3.2.3)
+  rails (= 3.2.6)
   rspec-rails
   ruby-nmap
   rubyzip (~> 0.9.6.1)

diff --git a/vendor/cache/actionmailer-3.2.3.gem b/vendor/cache/actionmailer-3.2.3.gem
diff --git a/vendor/cache/actionmailer-3.2.6.gem b/vendor/cache/actionmailer-3.2.6.gem
diff --git a/vendor/cache/actionpack-3.2.3.gem b/vendor/cache/actionpack-3.2.3.gem
diff --git a/vendor/cache/actionpack-3.2.6.gem b/vendor/cache/actionpack-3.2.6.gem
diff --git a/vendor/cache/activemodel-3.2.3.gem b/vendor/cache/activemodel-3.2.3.gem
diff --git a/vendor/cache/activemodel-3.2.6.gem b/vendor/cache/activemodel-3.2.6.gem
diff --git a/vendor/cache/activerecord-3.2.3.gem b/vendor/cache/activerecord-3.2.3.gem
diff --git a/vendor/cache/activerecord-3.2.6.gem b/vendor/cache/activerecord-3.2.6.gem
diff --git a/vendor/cache/activeresource-3.2.3.gem b/vendor/cache/activeresource-3.2.3.gem
diff --git a/vendor/cache/activeresource-3.2.6.gem b/vendor/cache/activeresource-3.2.6.gem
diff --git a/vendor/cache/activesupport-3.2.3.gem b/vendor/cache/activesupport-3.2.3.gem
diff --git a/vendor/cache/activesupport-3.2.6.gem b/vendor/cache/activesupport-3.2.6.gem
diff --git a/vendor/cache/database_cleaner-0.8.0.gem b/vendor/cache/database_cleaner-0.8.0.gem
diff --git a/vendor/cache/journey-1.0.3.gem b/vendor/cache/journey-1.0.3.gem
diff --git a/vendor/cache/journey-1.0.4.gem b/vendor/cache/journey-1.0.4.gem
diff --git a/vendor/cache/mime-types-1.18.gem b/vendor/cache/mime-types-1.18.gem
diff --git a/vendor/cache/mime-types-1.19.gem b/vendor/cache/mime-types-1.19.gem
diff --git a/vendor/cache/multi_json-1.3.5.gem b/vendor/cache/multi_json-1.3.5.gem
diff --git a/vendor/cache/multi_json-1.3.6.gem b/vendor/cache/multi_json-1.3.6.gem
diff --git a/vendor/cache/rails-3.2.3.gem → vendor/cache/rails-3.2.6.gem b/vendor/cache/rails-3.2.3.gem → vendor/cache/rails-3.2.6.gem
diff --git a/vendor/cache/railties-3.2.3.gem b/vendor/cache/railties-3.2.3.gem
diff --git a/vendor/cache/railties-3.2.6.gem b/vendor/cache/railties-3.2.6.gem