aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2011-04-15 19:57:52 +0200
committerJosé Valim <jose.valim@gmail.com>2011-04-15 19:57:52 +0200
commitafc828828ffffe7edeb4648a9d2aa4731191ae21 (patch)
tree8c85af7b1c0fa7fe1612d18f6d4573494f1d783b /actionpack/lib/action_controller
parentd84b2f37d018621aea99bfe30611ab75a02a291a (diff)
downloadrails-afc828828ffffe7edeb4648a9d2aa4731191ae21.tar.gz
rails-afc828828ffffe7edeb4648a9d2aa4731191ae21.tar.bz2
rails-afc828828ffffe7edeb4648a9d2aa4731191ae21.zip
Remove the ability for engines to serve assets from the public directory.
Diffstat (limited to 'actionpack/lib/action_controller')
-rw-r--r--actionpack/lib/action_controller/railties/paths.rb8
1 files changed, 0 insertions, 8 deletions
diff --git a/actionpack/lib/action_controller/railties/paths.rb b/actionpack/lib/action_controller/railties/paths.rb
index dce3c2fe88..699c44c62c 100644
--- a/actionpack/lib/action_controller/railties/paths.rb
+++ b/actionpack/lib/action_controller/railties/paths.rb
@@ -16,14 +16,6 @@ module ActionController
if klass.superclass == ActionController::Base && ActionController::Base.include_all_helpers
klass.helper :all
end
-
- if app.config.serve_static_assets && namespace
- paths = namespace._railtie.config.paths
-
- klass.config.assets_dir = paths["public"].first
- klass.config.javascripts_dir = paths["public/javascripts"].first
- klass.config.stylesheets_dir = paths["public/stylesheets"].first
- end
end
end
end