aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/abstract_controller/logger.rb
diff options
context:
space:
mode:
authorXavier Noria <fxn@hashref.com>2010-04-28 13:41:21 -0700
committerXavier Noria <fxn@hashref.com>2010-04-28 13:41:21 -0700
commitb9ab4c780af82c1c60d63c50f040a55da5bfa8db (patch)
tree4df8981047957fce17c10ea5c6aac7955aef2a4d /actionpack/lib/abstract_controller/logger.rb
parent8f1a5bfee1305f193bb659c010ca7e2272c12051 (diff)
parent22184930ea323872c73542767d447bbbd7878c96 (diff)
downloadrails-b9ab4c780af82c1c60d63c50f040a55da5bfa8db.tar.gz
rails-b9ab4c780af82c1c60d63c50f040a55da5bfa8db.tar.bz2
rails-b9ab4c780af82c1c60d63c50f040a55da5bfa8db.zip
Merge commit 'rails/master'
Diffstat (limited to 'actionpack/lib/abstract_controller/logger.rb')
-rw-r--r--actionpack/lib/abstract_controller/logger.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/abstract_controller/logger.rb b/actionpack/lib/abstract_controller/logger.rb
index 9318f5e369..0b196119f4 100644
--- a/actionpack/lib/abstract_controller/logger.rb
+++ b/actionpack/lib/abstract_controller/logger.rb
@@ -6,7 +6,7 @@ module AbstractController
extend ActiveSupport::Concern
included do
- cattr_accessor :logger
+ config_accessor :logger
extend ActiveSupport::Benchmarkable
end
end