aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/CHANGELOG
diff options
context:
space:
mode:
authorNicholas Seckar <nseckar@gmail.com>2006-08-13 03:29:04 +0000
committerNicholas Seckar <nseckar@gmail.com>2006-08-13 03:29:04 +0000
commit440655e1fae5ec5d22676a65462808fa11c2464e (patch)
tree25bbd3f59808e7f1913b8b24ac467293b136afd0 /activesupport/CHANGELOG
parent33406747d883d6c67aea4a5b96768db6acde0194 (diff)
downloadrails-440655e1fae5ec5d22676a65462808fa11c2464e.tar.gz
rails-440655e1fae5ec5d22676a65462808fa11c2464e.tar.bz2
rails-440655e1fae5ec5d22676a65462808fa11c2464e.zip
Add debugging logging to Dependencies.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4754 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activesupport/CHANGELOG')
-rw-r--r--activesupport/CHANGELOG5
1 files changed, 2 insertions, 3 deletions
diff --git a/activesupport/CHANGELOG b/activesupport/CHANGELOG
index d8cc98cd97..715315deb2 100644
--- a/activesupport/CHANGELOG
+++ b/activesupport/CHANGELOG
@@ -1,9 +1,9 @@
*SVN*
-<<<<<<< .mine
+* Add debugging logging to Dependencies. Currently can be enabled with Dependencies.log_activity = true; adding to Initializer and documenting is forthcoming. [Nicholas Seckar]
+
* Replace Reloadable with improvements to the Dependencies mechanism. [Nicholas Seckar]
-=======
* DateTime#to_time gives hour/minute/second resolution. #5747 [jon.evans@pobox.com]
* attr_internal to support namespacing and deprecation. Like attr_* except backed by internally-named instance variable. Set attr_internal_naming_format to change the format from the default '@_%s'. [Jeremy Kemper]
@@ -12,7 +12,6 @@
self.attr_internal_naming_format = '@%s__rofl'
attr_internal :foo
->>>>>>> .r4727
* Raise fully qualified names upon name errors. #5533 [lars@pinds.com, Nicholas Seckar]
* Add extention to obtain the missing constant from NameError instances. [Nicholas Seckar]