aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorJon Leighton <j@jonathanleighton.com>2011-03-12 08:44:03 +0000
committerJon Leighton <j@jonathanleighton.com>2011-03-12 08:44:03 +0000
commit17ea20426057aac43abcc0735534df31c577b918 (patch)
treefd6daf7d564a9ac7ca4b45964a761e50e40ba5be /railties
parent02a43f9f4585d3c932e12b60ef23543f9c534a2e (diff)
parentacd4bfb53764cfea0feaa367cfc8d00dbf9a87c3 (diff)
downloadrails-17ea20426057aac43abcc0735534df31c577b918.tar.gz
rails-17ea20426057aac43abcc0735534df31c577b918.tar.bz2
rails-17ea20426057aac43abcc0735534df31c577b918.zip
Merge branch 'master' into nested_has_many_through
Diffstat (limited to 'railties')
-rw-r--r--railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb1
-rw-r--r--railties/lib/rails/rack/logger.rb2
2 files changed, 2 insertions, 1 deletions
diff --git a/railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb b/railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb
index 8b1aed974f..5b4687ce64 100644
--- a/railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb
+++ b/railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb
@@ -1,5 +1,6 @@
require 'active_support/core_ext/hash/slice'
require "rails/generators/rails/app/app_generator"
+require 'date'
module Rails
class PluginBuilder
diff --git a/railties/lib/rails/rack/logger.rb b/railties/lib/rails/rack/logger.rb
index 32acc66f10..3be262de08 100644
--- a/railties/lib/rails/rack/logger.rb
+++ b/railties/lib/rails/rack/logger.rb
@@ -19,7 +19,7 @@ module Rails
def before_dispatch(env)
request = ActionDispatch::Request.new(env)
- path = request.fullpath
+ path = request.filtered_path
info "\n\nStarted #{request.request_method} \"#{path}\" " \
"for #{request.ip} at #{Time.now.to_default_s}"