Merge branch 'master' of https://github.com/rails/rails into performance_test

1 files changed, 3 insertions, 8 deletions

diff --git a/railties/lib/rails/engine/configuration.rb b/railties/lib/rails/engine/configuration.rb
index 4f458b0aee..241db4b0a9 100644
--- a/railties/lib/rails/engine/configuration.rb
+++ b/railties/lib/rails/engine/configuration.rb
@@ -5,7 +5,7 @@ module Rails
     class Configuration < ::Rails::Railtie::Configuration
       attr_reader :root
       attr_writer :middleware, :eager_load_paths, :autoload_once_paths, :autoload_paths
-      attr_accessor :plugins, :asset_path
+      attr_accessor :plugins
 
       def initialize(root=nil)
         super()
@@ -40,6 +40,7 @@ module Rails
         @paths ||= begin
           paths = Rails::Paths::Root.new(@root)
           paths.add "app",                 :eager_load => true, :glob => "*"
+          paths.add "app/assets",          :glob => "*"
           paths.add "app/controllers",     :eager_load => true
           paths.add "app/helpers",         :eager_load => true
           paths.add "app/models",          :eager_load => true
@@ -55,10 +56,8 @@ module Rails
           paths.add "db"
           paths.add "db/migrate"
           paths.add "db/seeds",            :with => "db/seeds.rb"
-          paths.add "public"
-          paths.add "public/javascripts"
-          paths.add "public/stylesheets"
           paths.add "vendor",              :load_path => true
+          paths.add "vendor/assets",       :glob => "*"
           paths.add "vendor/plugins"
           paths
         end
@@ -79,10 +78,6 @@ module Rails
       def autoload_paths
         @autoload_paths ||= paths.autoload_paths
       end
-
-      def compiled_asset_path
-        asset_path % "" if asset_path
-      end
     end
   end
 end