aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib/active_support
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge remote branch 'mainstream/master'Pratik Naik2010-02-1421-274/+310
|\| | | | | | | | | | | | | | | Conflicts: railties/README railties/guides/source/active_support_core_extensions.textile railties/guides/source/getting_started.textile railties/lib/generators/rails/app/templates/README
| * Missing requireYehuda Katz2010-02-141-0/+1
| |
| * name.blank? -> anonymous? in a few placesXavier Noria2010-02-141-1/+1
| | | | | | | | Signed-off-by: Yehuda Katz <yehudakatz@YK.local>
| * adds a few missing requires in AS object.rb and module.rbXavier Noria2010-02-142-0/+6
| | | | | | | | Signed-off-by: Yehuda Katz <yehudakatz@YK.local>
| * Simplify dependencies.rb some. Remove alias of Kernel::Foo to Object::Foo as ↵Yehuda Katz2010-02-141-190/+135
| | | | | | | | it was not used and breaks Ruby semantics.
| * fixes Module#anonymous? for 1.9Xavier Noria2010-02-111-2/+6
| |
| * moves Class#reachable? to Module#reachable?, bases implementation on ↵Xavier Noria2010-02-113-6/+14
| | | | | | | | anonymous? and constantize, and adds test coverage
| * defines Module#anonymous?Xavier Noria2010-02-112-1/+21
| |
| * Reinstate object/extending require too for Object.subclasses_ofJeremy Kemper2010-02-091-0/+1
| |
| * Reinstate Object.subclasses_of and Class#descendents for plugin compat.Jeremy Kemper2010-02-093-0/+70
| | | | | | | | This reverts commits 7d312e54bad9c39634c137caec07dfc8df471650, 5f981ff0294ba45aa44ad15aa063970b29aeec44, f85f5dfc8ffefff174b695c6363211d342f77a57, 245bfafe335ff883f7a096eab95ac22fe2848679, and ec7c642f5fe60afc857aa64f1a9b4c2be56f9d70
| * removes Module#as_load_path, which is no longer usedXavier Noria2010-02-072-26/+0
| |
| * removes Module#included_in_classes, which is no longer usedXavier Noria2010-02-072-31/+0
| |
| * Fix doc typo and update fast_xs URL. Thanks to Dmitrii Golub.Jeremy Kemper2010-02-072-2/+2
| |
| * Add backtrace cleaner on test unit railtie.José Valim2010-02-071-6/+0
| |
| * Merge remote branch 'fxn/master'Jeremy Kemper2010-02-062-8/+0
| |\
| | * removes Kernel#daemonize, which is no longer usedXavier Noria2010-02-062-8/+0
| | |
| * | remove trailing whitespaceRomD2010-02-061-1/+1
| | | | | | | | | | | | Signed-off-by: Carl Lerche <carllerche@mac.com>
| * | fix usage examples and more to use new invocationsRomD2010-02-062-2/+2
| |/ | | | | | | Signed-off-by: Carl Lerche <carllerche@mac.com>
| * Fix tiny version number from '3.0.0beta' to '3.0.0.beta1', so 'rake install' ↵Prem Sichanugrist2010-02-061-1/+1
| | | | | | | | | | | | will be run correctly [#3879 status:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
| * Making SafeBuffer << an alias for concat methodSantiago Pastorino2010-02-051-5/+2
| | | | | | | | | | | | [#3848 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * Automatically prefer Yajl or JSON backend over Yaml, if availableJeremy Kemper2010-02-051-1/+16
| |
| * Add yajl-ruby as a JSON parsing backendBrian Lopez2010-02-051-0/+40
| | | | | | | | | | | | [#2666 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* | removes p calls in rdoc examplesXavier Noria2010-02-061-8/+8
| |
* | reformats an example in the rdoc of delegateXavier Noria2010-02-061-2/+7
| |
* | Merge remote branch 'mainstream/master'Pratik Naik2010-02-044-14/+3
|\| | | | | | | | | Conflicts: railties/guides/source/3_0_release_notes.textile
| * Merge branch 'master' of gitproxy:rails/railsJosé Valim2010-02-041-1/+1
| |\
| | * Move to 3.0.0.betaDavid Heinemeier Hansson2010-02-031-1/+1
| | |
| * | Remove instrument! and require thread from AS::Notifications.José Valim2010-02-043-13/+2
| |/
* | Merge branch 'master' of git://github.com/rails/railsMikel Lindsaar2010-02-021-1/+1
|\| | | | | | | | | | | | | | | Conflicts: activemodel/README activemodel/lib/active_model/errors.rb activemodel/lib/active_model/serialization.rb railties/guides/source/3_0_release_notes.textile
| * Merge branch 'master' of git://github.com/rails/railsMikel Lindsaar2010-02-023-25/+125
| |\
| * | Updating copyright dates on all licensesMikel Lindsaar2010-02-011-1/+1
| | |
* | | Merge remote branch 'mainstream/master'Pratik Naik2010-02-013-25/+125
|\ \ \ | | |/ | |/|
| * | Convert to class_attributeJeremy Kemper2010-02-011-4/+4
| | |
| * | Introduce class_attribute to declare inheritable class attributes. Writing ↵Jeremy Kemper2010-02-011-0/+36
| | | | | | | | | | | | an attribute on a subclass behaves just like overriding the superclass reader method. Unifies and replaces most usage of cattr_accessor, class_inheritable_attribute, superclass_delegating_attribute, and extlib_inheritable_attribute.
| * | For performance reasons, you can no longer call html_safe! on Strings. ↵Yehuda Katz2010-01-311-21/+85
| |/ | | | | | | | | | | | | | | | | | | | | | | Instead, all Strings are always not html_safe?. Instead, you can get a SafeBuffer from a String by calling #html_safe, which will SafeBuffer.new(self). * Additionally, instead of doing concat("</form>".html_safe), you can do safe_concat("</form>"), which will skip both the flag set, and the flag check. * For the first pass, I converted virtually all #html_safe!s to #html_safe, and the tests pass. A further optimization would be to try to use #safe_concat as much as possible, reducing the performance impact if we know up front that a String is safe.
* | Merge remote branch 'mainstream/master'Pratik Naik2010-01-311-53/+27
|\| | | | | | | | | Conflicts: activemodel/lib/active_model/state_machine.rb
| * superclass_delegating_accessor rewritten to serve as the base for many other ↵Yehuda Katz2010-01-291-53/+27
| | | | | | | | kinds of accessors (step 1 of unification)
* | Merge remote branch 'mainstream/master'Pratik Naik2010-01-28161-18305/+122
|\| | | | | | | | | Conflicts: railties/lib/rails/railtie.rb
| * Time#- with a DateTime argument behaves the same as with a Time argument, ↵Geoff Buesing2010-01-271-1/+1
| | | | | | | | i.e. returns the difference between self and arg as a Float [#3476 status:resolved]
| * active_support/ordered_hash now requires yamlsnusnu2010-01-271-0/+2
| |
| * Unvendor'd MemCache-Client. Now requires the MemCache Client gem as a ↵Mikel Lindsaar2010-01-282-1152/+0
| | | | | | | | dependency - Don't forget to gem bundle buys and girls
| * Unvendor'd Builder. Now requires the Builder gem as a dependencyMikel Lindsaar2010-01-288-1041/+0
| |
| * Unbundling TZInfoMikel Lindsaar2010-01-28139-15983/+1
| |
| * Adding custom yaml (de-)serialization for OrderedHashGregor Schmidt2010-01-271-1/+22
| | | | | | | | | | | | [#3608 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * Update bundled TZInfo to v0.3.16Geoff Buesing2010-01-26141-120/+122
| |
| * Georgetown TimeZone is now mapped to "America/Guyana" instead of ↵Geoff Buesing2010-01-262-3/+27
| | | | | | | | "America/Argentina/San_Juan" [#1821 status:resolved]
| * Merge remote branch 'fxn/master'Jeremy Kemper2010-01-264-122/+0
| |\
| | * removes now void extending.rbXavier Noria2010-01-262-5/+0
| | |
| | * removes Object#extended_byXavier Noria2010-01-261-4/+0
| | |
| | * removes unused method Object#extend_with_included_modules_fromXavier Noria2010-01-261-4/+0
| | |