diff options
| author | Mikel Lindsaar <raasdnil@gmail.com> | 2010-04-25 17:07:55 +1000 |
|---|---|---|
| committer | Mikel Lindsaar <raasdnil@gmail.com> | 2010-04-25 17:07:55 +1000 |
| commit | e1b255aca456a5b456111b09237805fd32d15111 (patch) | |
| tree | a87c8b8989449a9dbdf1c6897901f6957ec021dc /actionpack/lib/action_controller/deprecated | |
| parent | 60ab54113fa833a1258d687673561b9474964149 (diff) | |
| parent | a5955196f2ed8a69c49a1a8c0c617ab91cb8d716 (diff) | |
| download | rails-e1b255aca456a5b456111b09237805fd32d15111.tar.gz rails-e1b255aca456a5b456111b09237805fd32d15111.tar.bz2 rails-e1b255aca456a5b456111b09237805fd32d15111.zip | |
Merge branch 'master' of github.com:lifo/docrails
Diffstat (limited to 'actionpack/lib/action_controller/deprecated')
| -rw-r--r-- | actionpack/lib/action_controller/deprecated/base.rb | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/actionpack/lib/action_controller/deprecated/base.rb b/actionpack/lib/action_controller/deprecated/base.rb index b817bf42bc..57203ce95f 100644 --- a/actionpack/lib/action_controller/deprecated/base.rb +++ b/actionpack/lib/action_controller/deprecated/base.rb @@ -146,12 +146,15 @@ module ActionController extend DeprecatedBehavior - deprecated_config_writer :session_store deprecated_config_writer :session_options - deprecated_config_accessor :perform_caching - deprecated_config_accessor :relative_url_root, "relative_url_root is ineffective. Please stop using it" + deprecated_config_writer :session_store + deprecated_config_accessor :assets_dir + deprecated_config_accessor :asset_path + deprecated_config_accessor :helpers_path deprecated_config_accessor :javascripts_dir + deprecated_config_accessor :page_cache_directory + deprecated_config_accessor :relative_url_root, "relative_url_root is ineffective. Please stop using it" deprecated_config_accessor :stylesheets_dir delegate :consider_all_requests_local, :consider_all_requests_local=, |