aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2012-01-27 08:51:41 -0800
committerAaron Patterson <aaron.patterson@gmail.com>2012-01-27 08:51:41 -0800
commit578c94ad025cc25b04473fbce687a4991c6348ed (patch)
tree6d59410896d50b61ff19cfdb5831b0d543a859da /railties/lib/rails
parent25d5c94baf10ade91ce8fc09d38fb33a7da9de62 (diff)
parent2e7d6ff08ddcb4f90f1ee78f28e102fb75990f0a (diff)
downloadrails-578c94ad025cc25b04473fbce687a4991c6348ed.tar.gz
rails-578c94ad025cc25b04473fbce687a4991c6348ed.tar.bz2
rails-578c94ad025cc25b04473fbce687a4991c6348ed.zip
Merge pull request #4722 from kennyj/fix_4708
Remove redundant instance variables (@colorize_logging)
Diffstat (limited to 'railties/lib/rails')
-rw-r--r--railties/lib/rails/application/configuration.rb3
1 files changed, 1 insertions, 2 deletions
diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb
index 9e9d26a783..1ad08220ee 100644
--- a/railties/lib/rails/application/configuration.rb
+++ b/railties/lib/rails/application/configuration.rb
@@ -112,11 +112,10 @@ module Rails
end
def colorize_logging
- @colorize_logging
+ ActiveSupport::LogSubscriber.colorize_logging
end
def colorize_logging=(val)
- @colorize_logging = val
ActiveSupport::LogSubscriber.colorize_logging = val
self.generators.colorize_logging = val
end