diff options
| author | Emilio Tagua <miloops@gmail.com> | 2011-02-15 12:01:04 -0300 |
|---|---|---|
| committer | Emilio Tagua <miloops@gmail.com> | 2011-02-15 12:01:04 -0300 |
| commit | 8ee0b4414890f919594c1a388d987b5b7364a505 (patch) | |
| tree | 6c6c6aa19da0eb8066d2f0b9b02b08f2cc696c29 /railties/lib/rails/rack | |
| parent | 348c0ec7c656b3691aa4e687565d28259ca0f693 (diff) | |
| parent | c9f1ab5365319e087e1b010a3f90626a2b8f080b (diff) | |
| download | rails-8ee0b4414890f919594c1a388d987b5b7364a505.tar.gz rails-8ee0b4414890f919594c1a388d987b5b7364a505.tar.bz2 rails-8ee0b4414890f919594c1a388d987b5b7364a505.zip | |
Merge remote branch 'rails/master' into identity_map
Conflicts:
activerecord/examples/performance.rb
activerecord/lib/active_record/association_preload.rb
activerecord/lib/active_record/associations.rb
activerecord/lib/active_record/associations/association_proxy.rb
activerecord/lib/active_record/autosave_association.rb
activerecord/lib/active_record/base.rb
activerecord/lib/active_record/nested_attributes.rb
activerecord/test/cases/relations_test.rb
Diffstat (limited to 'railties/lib/rails/rack')
| -rw-r--r-- | railties/lib/rails/rack/logger.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails/rack/logger.rb b/railties/lib/rails/rack/logger.rb index b3dc1f894c..32acc66f10 100644 --- a/railties/lib/rails/rack/logger.rb +++ b/railties/lib/rails/rack/logger.rb @@ -21,7 +21,7 @@ module Rails request = ActionDispatch::Request.new(env) path = request.fullpath - info "\n\nStarted #{env["REQUEST_METHOD"]} \"#{path}\" " \ + info "\n\nStarted #{request.request_method} \"#{path}\" " \ "for #{request.ip} at #{Time.now.to_default_s}" end |