diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2008-12-03 10:32:30 -0600 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2008-12-03 10:32:30 -0600 |
| commit | 99f2cb4918786382413bdd29b3cacfd5b9377677 (patch) | |
| tree | 9279a5f1b63a03f51b1a04734a4c70bb6b6c3546 /railties/helpers | |
| parent | 0b4858cf38f522208381f9bfbbb5c066aceb30d2 (diff) | |
| parent | 1e1056f6435254c81f02fd0fba53d9356050cb00 (diff) | |
| download | rails-99f2cb4918786382413bdd29b3cacfd5b9377677.tar.gz rails-99f2cb4918786382413bdd29b3cacfd5b9377677.tar.bz2 rails-99f2cb4918786382413bdd29b3cacfd5b9377677.zip | |
Merge branch 'master' of git@github.com:rails/rails
Diffstat (limited to 'railties/helpers')
| -rw-r--r-- | railties/helpers/application_controller.rb | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/railties/helpers/application_controller.rb b/railties/helpers/application_controller.rb index ef33aa8353..6635a3f487 100644 --- a/railties/helpers/application_controller.rb +++ b/railties/helpers/application_controller.rb @@ -3,12 +3,8 @@ class ApplicationController < ActionController::Base helper :all # include all helpers, all the time + protect_from_forgery # See ActionController::RequestForgeryProtection for details - # See ActionController::RequestForgeryProtection for details - protect_from_forgery - - # See ActionController::Base for details - # Uncomment this to filter the contents of submitted sensitive data parameters - # from your application log (in this case, all fields with names like "password"). + # Scrub sensitive parameters from your log # filter_parameter_logging :password end |