Merge branch 'master' of git@github.com:rails/rails

1 files changed, 15 insertions, 0 deletions

diff --git a/railties/helpers/application_controller.rb b/railties/helpers/application_controller.rb
new file mode 100644
index 0000000000..0a3ed822a4
--- /dev/null
+++ b/railties/helpers/application_controller.rb
@@ -0,0 +1,15 @@
+# Filters added to this controller apply to all controllers in the application.
+# Likewise, all the methods added will be available for all controllers.
+
+class ApplicationController < ActionController::Base
+  helper :all # include all helpers, all the time
+
+  # 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