diff options
| author | José Valim <jose.valim@gmail.com> | 2010-07-24 00:47:48 +0200 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2010-07-24 00:47:48 +0200 |
| commit | 2af8fd2829ec573ef7da8a44d31e5f25ef4a8408 (patch) | |
| tree | 788404caee97e85f04c865a3e256d9ce38b73006 /actionpack | |
| parent | affeb51569d291ef7304189fd77b32c6e269af57 (diff) | |
| download | rails-2af8fd2829ec573ef7da8a44d31e5f25ef4a8408.tar.gz rails-2af8fd2829ec573ef7da8a44d31e5f25ef4a8408.tar.bz2 rails-2af8fd2829ec573ef7da8a44d31e5f25ef4a8408.zip | |
Also move asset_path to AbstractController.
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/lib/abstract_controller/asset_paths.rb | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_controller/base.rb | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/actionpack/lib/abstract_controller/asset_paths.rb b/actionpack/lib/abstract_controller/asset_paths.rb index 16c900dcba..9ca2fb742f 100644 --- a/actionpack/lib/abstract_controller/asset_paths.rb +++ b/actionpack/lib/abstract_controller/asset_paths.rb @@ -3,7 +3,7 @@ module AbstractController extend ActiveSupport::Concern included do - config_accessor :asset_host, :assets_dir, :javascripts_dir, :stylesheets_dir + config_accessor :asset_host, :asset_path, :assets_dir, :javascripts_dir, :stylesheets_dir end end end
\ No newline at end of file diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb index e47f9056f3..9dfffced75 100644 --- a/actionpack/lib/action_controller/base.rb +++ b/actionpack/lib/action_controller/base.rb @@ -63,7 +63,6 @@ module ActionController klass.helper :all end - config_accessor :asset_path ActiveSupport.run_load_hooks(:action_controller, self) end end |