aboutsummaryrefslogtreecommitdiffstats
path: root/railties/test/application
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2010-02-17 00:48:04 +0100
committerJosé Valim <jose.valim@gmail.com>2010-02-17 00:48:04 +0100
commit3f948a0e2951a8bb7f32e98a404fb5ff97cb2896 (patch)
tree8528d926c137a3a0f18c21642a8b6be1f334b6df /railties/test/application
parentd4e008fd0f9ebac3383a0c3ac093de68db9e2e66 (diff)
parent762088a0ef1f69ab09833732cfe8190098303ee6 (diff)
downloadrails-3f948a0e2951a8bb7f32e98a404fb5ff97cb2896.tar.gz
rails-3f948a0e2951a8bb7f32e98a404fb5ff97cb2896.tar.bz2
rails-3f948a0e2951a8bb7f32e98a404fb5ff97cb2896.zip
Merge master.
Diffstat (limited to 'railties/test/application')
-rw-r--r--railties/test/application/configuration_test.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/test/application/configuration_test.rb b/railties/test/application/configuration_test.rb
index 56f45582c8..7ca605ec23 100644
--- a/railties/test/application/configuration_test.rb
+++ b/railties/test/application/configuration_test.rb
@@ -140,7 +140,7 @@ module ApplicationTests
require "#{app_path}/config/environment"
end
end
-
+
test "filter_parameters should be able to set via config.filter_parameters" do
add_to_config <<-RUBY
config.filter_parameters += [ :foo, 'bar', lambda { |key, value|