diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2009-11-17 22:47:23 +0000 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2009-11-17 22:47:23 +0000 |
| commit | 5446d5cb05b50a9a3f317ded774be438e0eff909 (patch) | |
| tree | 6b0b87efe3e95783763208215a3159fb63217a6d /railties/test/metal_test.rb | |
| parent | 9754debb9a72f9385950e5282f3642b995ab76d8 (diff) | |
| parent | f8877d4b2a2a6f68770b376f0b1391a6295f62f2 (diff) | |
| download | rails-5446d5cb05b50a9a3f317ded774be438e0eff909.tar.gz rails-5446d5cb05b50a9a3f317ded774be438e0eff909.tar.bz2 rails-5446d5cb05b50a9a3f317ded774be438e0eff909.zip | |
Merge remote branch 'mainstream/master'
Conflicts:
activesupport/lib/active_support/core_ext/hash/conversions.rb
Diffstat (limited to 'railties/test/metal_test.rb')
| -rw-r--r-- | railties/test/metal_test.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/test/metal_test.rb b/railties/test/metal_test.rb index 6864254e4c..2256b191e2 100644 --- a/railties/test/metal_test.rb +++ b/railties/test/metal_test.rb @@ -85,7 +85,7 @@ class MetalTest < Test::Unit::TestCase private def app - lambda{[402,{},["End of the Line"]]} + lambda{|env|[402,{},["End of the Line"]]} end def use_appdir(root) |