From fc5ccd2c0b10533a5101bf247023246f6148d723 Mon Sep 17 00:00:00 2001
From: Santiago Pastorino <santiago@wyeworks.com>
Date: Fri, 9 Nov 2012 13:15:09 -0200
Subject: Revert "Respect children paths filter settings"

This reverts commit 53778ec2d716f860646fd43957fd53c8db4da2fe.
Closes #8146
---
 railties/lib/rails/paths.rb | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

(limited to 'railties/lib/rails')

diff --git a/railties/lib/rails/paths.rb b/railties/lib/rails/paths.rb
index 17eba4c69c..4ac3d88dc2 100644
--- a/railties/lib/rails/paths.rb
+++ b/railties/lib/rails/paths.rb
@@ -87,15 +87,14 @@ module Rails
     protected
 
       def filter_by(constraint)
-        yes = []
-        no  = []
-
+        all = []
         all_paths.each do |path|
-          paths = path.existent + path.existent_base_paths
-          path.send(constraint) ? yes.concat(paths) : no.concat(paths)
+          if path.send(constraint)
+            paths  = path.existent
+            paths -= path.children.map { |p| p.send(constraint) ? [] : p.existent }.flatten
+            all.concat(paths)
+          end
         end
-
-        all = yes - no
         all.uniq!
         all
       end
@@ -195,10 +194,6 @@ module Rails
         expanded.select { |d| File.directory?(d) }
       end
 
-      def existent_base_paths
-        map { |p| File.expand_path(p, @root.path) }.select{ |f| File.exist? f }
-      end
-
       alias to_a expanded
 
       private
-- 
cgit v1.2.3


From db1d5f40714a47c58c13ff7d9643e8a0dec6bef8 Mon Sep 17 00:00:00 2001
From: Santiago Pastorino <santiago@wyeworks.com>
Date: Fri, 9 Nov 2012 15:51:03 -0200
Subject: Bump up to 3.2.9.rc3

---
 railties/lib/rails/version.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'railties/lib/rails')

diff --git a/railties/lib/rails/version.rb b/railties/lib/rails/version.rb
index 8a295801af..28bc89a62d 100644
--- a/railties/lib/rails/version.rb
+++ b/railties/lib/rails/version.rb
@@ -3,7 +3,7 @@ module Rails
     MAJOR = 3
     MINOR = 2
     TINY  = 9
-    PRE   = "rc2"
+    PRE   = "rc3"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
   end
-- 
cgit v1.2.3