diff options
| author | Nicholas Seckar <nseckar@gmail.com> | 2006-08-08 21:21:04 +0000 |
|---|---|---|
| committer | Nicholas Seckar <nseckar@gmail.com> | 2006-08-08 21:21:04 +0000 |
| commit | 74165eb6acaca98d4da13409c4e5b5ecc9d260f7 (patch) | |
| tree | 024158d20563f34cca52a00b42aaa6c922777559 /activesupport/CHANGELOG | |
| parent | 94a1309194fa5962e33d395ede14e94b237c54f5 (diff) | |
| download | rails-74165eb6acaca98d4da13409c4e5b5ecc9d260f7.tar.gz rails-74165eb6acaca98d4da13409c4e5b5ecc9d260f7.tar.bz2 rails-74165eb6acaca98d4da13409c4e5b5ecc9d260f7.zip | |
New dependencies implementation
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4728 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activesupport/CHANGELOG')
| -rw-r--r-- | activesupport/CHANGELOG | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/activesupport/CHANGELOG b/activesupport/CHANGELOG index 3ddfc19643..d8cc98cd97 100644 --- a/activesupport/CHANGELOG +++ b/activesupport/CHANGELOG @@ -1,5 +1,9 @@ *SVN* +<<<<<<< .mine +* 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] @@ -8,6 +12,7 @@ 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] |