aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
Diffstat (limited to 'railties')
-rw-r--r--railties/helpers/application_controller.rb8
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