diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2009-03-12 15:31:24 +0000 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2009-03-12 15:31:24 +0000 |
| commit | 53744c543880999a7ad3f1e026875df3283978f1 (patch) | |
| tree | 8d01e0c15a384a46db176ad8d5cdd0bd6c9024a8 /actionpack/lib/action_controller/vendor/rack-1.0/rack/builder.rb | |
| parent | 053afbe3bd26d627ee04a0aaa73554b7be422f05 (diff) | |
| parent | 47bdf3bf40ec17e1f8ca1c0e3d7f697d0c4cd1bf (diff) | |
| download | rails-53744c543880999a7ad3f1e026875df3283978f1.tar.gz rails-53744c543880999a7ad3f1e026875df3283978f1.tar.bz2 rails-53744c543880999a7ad3f1e026875df3283978f1.zip | |
Merge commit 'mainstream/master'
Conflicts:
actionpack/lib/action_view/helpers/text_helper.rb
activesupport/lib/active_support/inflector.rb
Diffstat (limited to 'actionpack/lib/action_controller/vendor/rack-1.0/rack/builder.rb')
| -rw-r--r-- | actionpack/lib/action_controller/vendor/rack-1.0/rack/builder.rb | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/actionpack/lib/action_controller/vendor/rack-1.0/rack/builder.rb b/actionpack/lib/action_controller/vendor/rack-1.0/rack/builder.rb index 25994d5a44..295235e56a 100644 --- a/actionpack/lib/action_controller/vendor/rack-1.0/rack/builder.rb +++ b/actionpack/lib/action_controller/vendor/rack-1.0/rack/builder.rb @@ -34,11 +34,7 @@ module Rack end def use(middleware, *args, &block) - @ins << if block_given? - lambda { |app| middleware.new(app, *args, &block) } - else - lambda { |app| middleware.new(app, *args) } - end + @ins << lambda { |app| middleware.new(app, *args, &block) } end def run(app) |