Merge pull request #7587 from elia/fix-too-eager-loading

Should not eager_load app/assets
Conflicts:
	railties/CHANGELOG.md

1 files changed, 12 insertions, 6 deletions

diff --git a/railties/lib/rails/paths.rb b/railties/lib/rails/paths.rb
index 8af4130e87..cfdb15a14e 100644
--- a/railties/lib/rails/paths.rb
+++ b/railties/lib/rails/paths.rb
@@ -99,14 +99,15 @@ module Rails
     protected
 
       def filter_by(constraint)
-        all = []
+        yes = []
+        no  = []
+
         all_paths.each do |path|
-          if path.send(constraint)
-            paths  = path.existent
-            paths -= path.children.map { |p| p.send(constraint) ? [] : p.existent }.flatten
-            all.concat(paths)
-          end
+          paths = path.existent + path.existent_base_paths
+          path.send(constraint) ? yes.concat(paths) : no.concat(paths)
         end
+
+        all = yes - no
         all.uniq!
         all
       end
@@ -134,6 +135,7 @@ module Rails
         keys.delete(@current)
         @root.values_at(*keys.sort)
       end
+      deprecate :children
 
       def first
         expanded.first
@@ -210,6 +212,10 @@ 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
     end
   end