diff options
| author | wycats <wycats@gmail.com> | 2010-03-10 13:28:52 -0800 |
|---|---|---|
| committer | wycats <wycats@gmail.com> | 2010-03-10 13:28:52 -0800 |
| commit | 4745b53bcda400cf2e8cb4f2c0bf068f6d13c0e5 (patch) | |
| tree | 6f080f704435d22dbfee6ffd454529c12e5bb505 /actionpack/lib/action_view/base.rb | |
| parent | 7b622786fcc5046a06989ec7a3cbf46f92e04dea (diff) | |
| parent | 84f6da45a19d335be320991cab44f492f61dc5c7 (diff) | |
| download | rails-4745b53bcda400cf2e8cb4f2c0bf068f6d13c0e5.tar.gz rails-4745b53bcda400cf2e8cb4f2c0bf068f6d13c0e5.tar.bz2 rails-4745b53bcda400cf2e8cb4f2c0bf068f6d13c0e5.zip | |
Merge branch 'master' of github.com:rails/rails
Diffstat (limited to 'actionpack/lib/action_view/base.rb')
| -rw-r--r-- | actionpack/lib/action_view/base.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_view/base.rb b/actionpack/lib/action_view/base.rb index 564ea6684c..ffe3060404 100644 --- a/actionpack/lib/action_view/base.rb +++ b/actionpack/lib/action_view/base.rb @@ -194,7 +194,7 @@ module ActionView #:nodoc: attr_accessor :base_path, :assigns, :template_extension, :lookup_context attr_internal :captures, :request, :layout, :controller, :template, :config - delegate :find, :exists?, :formats, :formats=, + delegate :find, :exists?, :formats, :formats=, :locale, :locale=, :view_paths, :view_paths=, :with_fallbacks, :update_details, :to => :lookup_context delegate :request_forgery_protection_token, :template, :params, :session, :cookies, :response, :headers, |