Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote branch 'rails/master' | Xavier Noria | 2010-06-20 | 21 | -164/+410 |
|\ | | | | | | | | | Conflicts: actionpack/lib/abstract_controller/base.rb | ||||
| * | Update ActiveSupport CHANGELOG with latest changes. | José Valim | 2010-06-20 | 1 | -0/+4 |
| | | |||||
| * | I18n.reload! is only called if any of the locale files actually changed. | José Valim | 2010-06-20 | 3 | -71/+82 |
| | | |||||
| * | Add ActiveSupport::FileUpdateChecker. | José Valim | 2010-06-20 | 3 | -1/+96 |
| | | |||||
| * | Adds titleize/titlecase to AS::Multibyte::Chars | Norman Clarke | 2010-06-20 | 2 | -0/+24 |
| | | | | | | | | | | | | [#2794 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
| * | remove executable permission from files that don't need it. [#4802 ↵ | rohit | 2010-06-20 | 2 | -0/+0 |
| | | | | | | | | | | | | state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
| * | <=> is defined twice on multibyte/chars.rb for Ruby < 1.9 | Sam Elliott and Santiago Pastorino | 2010-06-20 | 1 | -14/+10 |
| | | | | | | | | | | | | [#4850 state:committed] Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
| * | Merge branch 'master' of github.com:rails/rails | José Valim | 2010-06-20 | 1 | -1/+1 |
| |\ | |||||
| | * | Fix Yajl backend discovery in ActiveSupport::JSON | Maxime RETY | 2010-06-18 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | [#4897 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | | Remove descendants warning while executing tests. | José Valim | 2010-06-19 | 2 | -2/+5 |
| | | | |||||
| * | | Change callbacks to automatically include DescendantsTracker and rename ↵ | José Valim | 2010-06-19 | 3 | -10/+17 |
| | | | | | | | | | | | | descendents to descendants. | ||||
| * | | Add ActiveSupport::DescendantsTracker. | José Valim | 2010-06-19 | 3 | -0/+109 |
| |/ | |||||
| * | enable_stats added back in since Benchmarker doesn't start RubyProf | Gonçalo Silva | 2010-06-17 | 1 | -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 Silva | 2010-06-17 | 1 | -1/+1 |
| | | | | | | | | the 'data' method | ||||
| * | added information about what is being used | Gonçalo Silva | 2010-06-17 | 1 | -2/+6 |
| | | |||||
| * | heap_live_objects+heap_free_objects is broken, use heap_total_objects instead | Gonçalo Silva | 2010-06-17 | 1 | -2/+1 |
| | | |||||
| * | also use GC profiler extended patch to retrieve GC time on 1.9 | Gonçalo Silva | 2010-06-17 | 1 | -1/+12 |
| | | |||||
| * | ruby's GC doesn't support the time method, removed support for it | Gonçalo Silva | 2010-06-17 | 1 | -4/+0 |
| | | |||||
| * | use GC profiler extended patch to retrieve GC runs on 1.9 | Gonçalo Silva | 2010-06-17 | 1 | -1/+12 |
| | | |||||
| * | ruby's GC doesn't support collections and heap_info, RubyProf can handle it | Gonçalo Silva | 2010-06-17 | 1 | -8/+0 |
| | | |||||
| * | GC at 1.9.X doesn't have malloc_allocated_size, remove support for it | Gonçalo Silva | 2010-06-17 | 1 | -12/+0 |
| | | |||||
| * | removed support for 1.8's GC alternative hacks (railsbench and lloyd ↵ | Gonçalo Silva | 2010-06-17 | 1 | -25/+0 |
| | | | | | | | | patches). RubyProf can handle it | ||||
| * | check if the data method is defined (meaning it's correctly patched) | Gonçalo Silva | 2010-06-17 | 1 | -4/+4 |
| | | |||||
| * | the official profiler (present in 1.9) should have the highest priority | Gonçalo Silva | 2010-06-17 | 1 | -31/+31 |
| | | |||||
| * | don't set cpu_frequency if RubyProf resolved it | Gonçalo Silva | 2010-06-17 | 1 | -2/+2 |
| | | |||||
| * | when the timezone is nil, a TimeWithZone object should not be constructed. ↵ | Aaron Patterson | 2010-06-17 | 3 | -0/+11 |
| | | | | | | | | | | | | [#4881 state:resolved] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | pdoc tasks publishe APIs in api.rubyonrails.org | Xavier Noria | 2010-06-16 | 1 | -1/+1 |
| | | |||||
| * | use RDoc 2.2 to generate the documentation of individual components | Xavier Noria | 2010-06-16 | 1 | -0/+2 |
| | | |||||
* | | Fix comment in en.yml datime_select -> datetime_select | Rodrigo Rosenfeld Rosas | 2010-06-20 | 1 | -1/+1 |
| | | |||||
* | | Remove documentation reference to AS::Notifications::Event#result because it ↵ | Hongli Lai (Phusion) | 2010-06-17 | 1 | -1/+0 |
| | | | | | | | | has been removed. | ||||
* | | Fix a bunch of minor spelling mistakes | Evgeniy Dolzhenko | 2010-06-15 | 9 | -9/+9 |
|\ \ | |/ |/| | |||||
| * | Fix a bunch of minor spelling mistakes | Evgeniy Dolzhenko | 2010-06-11 | 9 | -9/+9 |
| | | |||||
* | | edit pass: the names of Rails components have a space, ie, "Active Record", ↵ | Xavier Noria | 2010-06-14 | 2 | -2/+2 |
| | | | | | | | | not "ActiveRecord" | ||||
* | | edit pass in #define_callbacks rdoc | Xavier Noria | 2010-06-14 | 1 | -20/+22 |
| | | |||||
* | | adding to the :kind documentation for ActiveSupport callbacks | Neeraj Singh | 2010-06-14 | 1 | -0/+5 |
| | | |||||
* | | clearer documentation of how scope applies to ActiveSupport callbacks | Neeraj Singh | 2010-06-14 | 1 | -20/+32 |
| | | |||||
* | | explains why AS::OrderedHash does not leverage inheritance | Xavier Noria | 2010-06-13 | 1 | -0/+11 |
| | | |||||
* | | removes spurious .rb in require | Santiago Pastorino | 2010-06-13 | 1 | -1/+1 |
| | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | | Change implementation to do it without asking each time for block_given? | Santiago Pastorino | 2010-06-13 | 1 | -6/+4 |
| | | | | | | | | Signed-off-by: Xavier Noria <fxn@hashref.com> | ||||
* | | revises implementation of AS::OrderedHash#merge! | Xavier Noria | 2010-06-13 | 3 | -21/+24 |
| | | |||||
* | | Revert "hash merging with a block ignores non-existing keys altogether" | Xavier Noria | 2010-06-13 | 2 | -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 altogether | Xavier Noria | 2010-06-13 | 2 | -18/+17 |
| | | |||||
* | | re-organized test for merge into separate tests | Paul Barry | 2010-06-13 | 1 | -13/+21 |
| | | | | | | | | Signed-off-by: Xavier Noria <fxn@hashref.com> | ||||
* | | Support passing a block to ActiveSupport::OrderedHash's merge and merge! ↵ | Paul Mucur | 2010-06-13 | 3 | -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#ord | Santiago Pastorino | 2010-06-12 | 1 | -0/+1 |
| | | |||||
* | | registers 4146a44 in CHANGELOG | Xavier Noria | 2010-06-12 | 1 | -0/+5 |
| | | |||||
* | | No need to call convert_key before except. | José Valim | 2010-06-12 | 1 | -1/+0 |
| | | |||||
* | | Simplify and optimize callbacks superclass sync. | José Valim | 2010-06-12 | 1 | -54/+21 |
| | | |||||
* | | Date#since, #ago, #beginning_of_day, #end_of_day, #xmlschema return ↵ | Geoff Buesing | 2010-06-12 | 3 | -6/+65 |
| | | | | | | | | | | | | TimeWithZone when Time.zone_default is set Signed-off-by: Xavier Noria <fxn@hashref.com> | ||||
* | | Remove String#constantize deps | Jeremy Kemper | 2010-06-11 | 2 | -8/+9 |
| | |