diff options
| author | rick <rick@spacemonkey.local> | 2008-05-10 17:46:55 -0700 |
|---|---|---|
| committer | rick <rick@spacemonkey.local> | 2008-05-10 17:46:55 -0700 |
| commit | d09a8446d5606a5a0b5c024224b09a1318e9cf4d (patch) | |
| tree | 199ef3554f731c980ea5726e67e34af4ea057c2e /railties/helpers | |
| parent | c8451aeeea200043d8a3e6eae9c49def3a154ddb (diff) | |
| parent | a7ea06b4ebe252e258f83e7de945b4baa30ec3bc (diff) | |
| download | rails-d09a8446d5606a5a0b5c024224b09a1318e9cf4d.tar.gz rails-d09a8446d5606a5a0b5c024224b09a1318e9cf4d.tar.bz2 rails-d09a8446d5606a5a0b5c024224b09a1318e9cf4d.zip | |
fix merge conflict with actionpack changelog
Diffstat (limited to 'railties/helpers')
| -rw-r--r-- | railties/helpers/application.rb | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/railties/helpers/application.rb b/railties/helpers/application.rb index 9a79f69a41..0a3ed822a4 100644 --- a/railties/helpers/application.rb +++ b/railties/helpers/application.rb @@ -7,4 +7,9 @@ class ApplicationController < ActionController::Base # See ActionController::RequestForgeryProtection for details # Uncomment the :secret if you're not using the cookie session store protect_from_forgery # :secret => '<%= app_secret %>' + + # 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"). + # filter_parameter_logging :password end |