aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of github.com:rails/railsJosé Valim2010-06-201-1/+1
|\
| * Fix Yajl backend discovery in ActiveSupport::JSONMaxime RETY2010-06-181-1/+1
| | | | | | | | | | | | [#4897 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* | Remove descendants warning while executing tests.José Valim2010-06-192-2/+5
| |
* | Change callbacks to automatically include DescendantsTracker and rename ↵José Valim2010-06-193-10/+17
| | | | | | | | descendents to descendants.
* | Add ActiveSupport::DescendantsTracker.José Valim2010-06-193-0/+109
|/
* enable_stats added back in since Benchmarker doesn't start RubyProfGonçalo Silva2010-06-171-1/+9
| | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* check if the profiler patch is applied, otherwise GC::Profiler doesn't have ↵Gonçalo Silva2010-06-171-1/+1
| | | | the 'data' method
* added information about what is being usedGonçalo Silva2010-06-171-2/+6
|
* heap_live_objects+heap_free_objects is broken, use heap_total_objects insteadGonçalo Silva2010-06-171-2/+1
|
* also use GC profiler extended patch to retrieve GC time on 1.9Gonçalo Silva2010-06-171-1/+12
|
* ruby's GC doesn't support the time method, removed support for itGonçalo Silva2010-06-171-4/+0
|
* use GC profiler extended patch to retrieve GC runs on 1.9Gonçalo Silva2010-06-171-1/+12
|
* ruby's GC doesn't support collections and heap_info, RubyProf can handle itGonçalo Silva2010-06-171-8/+0
|
* GC at 1.9.X doesn't have malloc_allocated_size, remove support for itGonçalo Silva2010-06-171-12/+0
|
* removed support for 1.8's GC alternative hacks (railsbench and lloyd ↵Gonçalo Silva2010-06-171-25/+0
| | | | patches). RubyProf can handle it
* check if the data method is defined (meaning it's correctly patched)Gonçalo Silva2010-06-171-4/+4
|
* the official profiler (present in 1.9) should have the highest priorityGonçalo Silva2010-06-171-31/+31
|
* don't set cpu_frequency if RubyProf resolved itGonçalo Silva2010-06-171-2/+2
|
* when the timezone is nil, a TimeWithZone object should not be constructed. ↵Aaron Patterson2010-06-173-0/+11
| | | | | | [#4881 state:resolved] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* pdoc tasks publishe APIs in api.rubyonrails.orgXavier Noria2010-06-161-1/+1
|
* use RDoc 2.2 to generate the documentation of individual componentsXavier Noria2010-06-161-0/+2
|
* edit pass: the names of Rails components have a space, ie, "Active Record", ↵Xavier Noria2010-06-142-2/+2
| | | | not "ActiveRecord"
* edit pass in #define_callbacks rdocXavier Noria2010-06-141-20/+22
|
* adding to the :kind documentation for ActiveSupport callbacksNeeraj Singh2010-06-141-0/+5
|
* clearer documentation of how scope applies to ActiveSupport callbacksNeeraj Singh2010-06-141-20/+32
|
* explains why AS::OrderedHash does not leverage inheritanceXavier Noria2010-06-131-0/+11
|
* removes spurious .rb in requireSantiago Pastorino2010-06-131-1/+1
| | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* Change implementation to do it without asking each time for block_given?Santiago Pastorino2010-06-131-6/+4
| | | | Signed-off-by: Xavier Noria <fxn@hashref.com>
* revises implementation of AS::OrderedHash#merge!Xavier Noria2010-06-133-21/+24
|
* Revert "hash merging with a block ignores non-existing keys altogether"Xavier Noria2010-06-132-17/+18
| | | | | | This reverts commit 72f9fec607c4a72b2e88995d0cb32b16b96e9068. It is wrong, this feature is a little undocumented, doing some research.
* hash merging with a block ignores non-existing keys altogetherXavier Noria2010-06-132-18/+17
|
* re-organized test for merge into separate testsPaul Barry2010-06-131-13/+21
| | | | Signed-off-by: Xavier Noria <fxn@hashref.com>
* Support passing a block to ActiveSupport::OrderedHash's merge and merge! ↵Paul Mucur2010-06-133-3/+22
| | | | | | | | [#4838 state:committed] For better consistency with Ruby's own Hash implementation. Signed-off-by: Xavier Noria <fxn@hashref.com>
* require conversions to use String#ordSantiago Pastorino2010-06-121-0/+1
|
* registers 4146a44 in CHANGELOGXavier Noria2010-06-121-0/+5
|
* No need to call convert_key before except.José Valim2010-06-121-1/+0
|
* Simplify and optimize callbacks superclass sync.José Valim2010-06-121-54/+21
|
* Date#since, #ago, #beginning_of_day, #end_of_day, #xmlschema return ↵Geoff Buesing2010-06-123-6/+65
| | | | | | TimeWithZone when Time.zone_default is set Signed-off-by: Xavier Noria <fxn@hashref.com>
* Remove String#constantize depsJeremy Kemper2010-06-112-8/+9
|
* Explicitly delegate Chars#<=> to work around Kernel#<=> possibly ignoring ↵Jeremy Kemper2010-06-111-3/+4
| | | | method_missing
* Get ready for beta 4David Heinemeier Hansson2010-06-082-2/+2
|
* Missing require restoredwycats2010-06-081-0/+1
|
* Require encoding.rbwycats2010-06-081-0/+1
|
* Move the undef into the 1.9 only branchwycats2010-06-071-2/+2
|
* Merge remote branch 'rsim/oracle_enhanced_rails3'wycats2010-06-073-6/+6
|\
| * fix conditions when DateTime#to_date and DateTime#xmlschema methods are definedRaimonds Simanovskis2010-06-043-6/+6
| |
* | If we undef <=>, it solves a problem involving comparison. Please figure out ↵wycats2010-06-071-0/+2
| | | | | | | | the root cause.
* | Fixed Load Error failures in 1.9.2-headRizwan Reza2010-06-071-0/+1
| |
* | oops, two cancelling errors made a previous test pass, fixing itXavier Noria2010-06-071-1/+1
| |
* | the order in which we apply deltas in Date#advance matters, add test ↵Xavier Noria2010-06-071-0/+10
| | | | | | | | coverage for that