diff options
author | Xavier Noria <fxn@hashref.com> | 2010-04-19 05:10:55 -0700 |
---|---|---|
committer | Xavier Noria <fxn@hashref.com> | 2010-04-19 05:10:55 -0700 |
commit | 792910bb69078ff1d14a6384b50e51aba2aae2dd (patch) | |
tree | 705defb52d5ac6eb903e97334de718defc7ba4e3 /actionpack/lib/action_controller/deprecated/base.rb | |
parent | e00c72c9718e518eb99058781f6ee71fa46b38fe (diff) | |
parent | ad4615e97896428ca140411081442f1b5e7d6089 (diff) | |
download | rails-792910bb69078ff1d14a6384b50e51aba2aae2dd.tar.gz rails-792910bb69078ff1d14a6384b50e51aba2aae2dd.tar.bz2 rails-792910bb69078ff1d14a6384b50e51aba2aae2dd.zip |
Merge commit 'rails/master'
Diffstat (limited to 'actionpack/lib/action_controller/deprecated/base.rb')
-rw-r--r-- | actionpack/lib/action_controller/deprecated/base.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/deprecated/base.rb b/actionpack/lib/action_controller/deprecated/base.rb index f91f637db8..57203ce95f 100644 --- a/actionpack/lib/action_controller/deprecated/base.rb +++ b/actionpack/lib/action_controller/deprecated/base.rb @@ -154,7 +154,6 @@ module ActionController deprecated_config_accessor :helpers_path deprecated_config_accessor :javascripts_dir deprecated_config_accessor :page_cache_directory - deprecated_config_accessor :protected_instance_variables deprecated_config_accessor :relative_url_root, "relative_url_root is ineffective. Please stop using it" deprecated_config_accessor :stylesheets_dir |