2 files changed, 8 insertions, 0 deletions
diff --git a/railties/lib/generators/rails/app/templates/config/application.rb b/railties/lib/generators/rails/app/templates/config/application.rb
index 334820826f..8a7f024a4d 100644
--- a/railties/lib/generators/rails/app/templates/config/application.rb
+++ b/railties/lib/generators/rails/app/templates/config/application.rb
@@ -30,5 +30,9 @@ module <%= app_const_base %>
     #   g.template_engine :erb
     #   g.test_framework  :test_unit, :fixture => true
     # end
+    
+    # Configure sensitive parameters which will be filtered from the log file.
+    # Check the documentation for ActionDispatch::Http::ParametersFilter for more information.
+    # config.filter_parameters :password
   end
 end
diff --git a/railties/lib/rails/configuration.rb b/railties/lib/rails/configuration.rb
index b76a7ac2d8..ae4f4007e7 100644
--- a/railties/lib/rails/configuration.rb
+++ b/railties/lib/rails/configuration.rb
@@ -252,6 +252,10 @@ module Rails
         i18n
       end
     end
+    
+    def filter_parameters(*filter_words, &block)
+      ActionDispatch::Http::ParametersFilter.filter_parameters(*filter_words, &block)
+    end
 
     def environment_path
       "#{root}/config/environments/#{Rails.env}.rb"