aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib
Commit message (Collapse)AuthorAgeFilesLines
* Work around the fact the JSON gem was overwriting to_json implementation for ↵José Valim2010-06-261-5/+14
| | | | | | | all Ruby core classes. This is required because the JSON gem is incompatible with Rails behavior and was not allowing ActiveModel::Errors to be serialized. So we need to ensure Rails implementation is the one triggered. [#4890 state:resolved]
* Move some methods into 1.8.x-only proxy. [#4978 state:resolved]Norman Clarke2010-06-261-40/+39
| | | | | | | | These methods had been overridden because they had bugs on 1.9.1. Since Rails now supports only 1.9.2, and these methods now work properly on that version, there's no longer any need to override them. Signed-off-by: José Valim <jose.valim@gmail.com>
* Remove previously defined class method logger to supress warnings in Active ↵rohit2010-06-261-0/+4
| | | | | | Support test suites. [#4618 state:open] Signed-off-by: José Valim <jose.valim@gmail.com>
* Alias ActiveSupport::OrderedHash#update to ActiveSupport::OrderedHash.merge!Paul Mucur2010-06-251-0/+2
| | | | | | | | This ensures that an OrderedHash's keys are set up appropriately when using update. [#4973 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* AS::Isolation functional on Windows/JRuby.Nick Sieger2010-06-241-8/+11
| | | | | | Doesn't make up for the fact that it's slooooooooow, though. Signed-off-by: wycats <wycats@gmail.com>
* Move Rails::LogSubscriber to ActiveSupport::LogSubscriber, allowing ↵José Valim2010-06-243-1/+206
| | | | frameworks like ActiveRecord and ActiveResource to log outsude Rails::Application [#4816 state:resolved]
* Avoid using Pathname on Resolver and AS::Dependencies.José Valim2010-06-241-6/+15
|
* renames load_(once_)paths to autoload_(once_)paths in dependencies and configXavier Noria2010-06-241-12/+12
|
* Missing require for the class/attribute.rb [4812 state:resolved]Prem Sichanugrist2010-06-221-0/+1
| | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* preventing memcached initialization errors with default servers list [#4921 ↵David Calavera2010-06-221-1/+1
| | | | | | | | state:resolved] As of this writing the JRuby client does not support a default port. Signed-off-by: Xavier Noria <fxn@hashref.com>
* removed default Formatter in logger, not needed with 1.8.7 upwardsJosh Kalderimis2010-06-221-38/+0
| | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* removed 'unless const_defined?' code smellJosh Kalderimis2010-06-212-149/+147
| | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* Initialize @last_update_at in file_update_checker to hide warnings in AS ↵rohit2010-06-211-2/+2
| | | | | | test suite. Signed-off-by: José Valim <jose.valim@gmail.com>
* Allow instrumentation of cache hits and misses. [#4888 state:resolved]Hongli Lai (Phusion)2010-06-211-25/+40
| | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* Merge remote branch 'rails/master'Xavier Noria2010-06-2014-163/+251
|\ | | | | | | | | Conflicts: actionpack/lib/abstract_controller/base.rb
| * I18n.reload! is only called if any of the locale files actually changed.José Valim2010-06-203-71/+82
| |
| * Add ActiveSupport::FileUpdateChecker.José Valim2010-06-202-1/+40
| |
| * Adds titleize/titlecase to AS::Multibyte::CharsNorman Clarke2010-06-201-0/+10
| | | | | | | | | | | | [#2794 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
| * remove executable permission from files that don't need it. [#4802 ↵rohit2010-06-201-0/+0
| | | | | | | | | | | | state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
| * <=> is defined twice on multibyte/chars.rb for Ruby < 1.9Sam Elliott and Santiago Pastorino2010-06-201-14/+10
| | | | | | | | | | | | [#4850 state:committed] Signed-off-by: José Valim <jose.valim@gmail.com>
| * 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-191-1/+4
| | |
| * | Change callbacks to automatically include DescendantsTracker and rename ↵José Valim2010-06-192-8/+12
| | | | | | | | | | | | descendents to descendants.
| * | Add ActiveSupport::DescendantsTracker.José Valim2010-06-192-0/+37
| |/
| * 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-172-0/+4
| | | | | | | | | | | | [#4881 state:resolved] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* | Fix comment in en.yml datime_select -> datetime_selectRodrigo Rosenfeld Rosas2010-06-201-1/+1
| |
* | Remove documentation reference to AS::Notifications::Event#result because it ↵Hongli Lai (Phusion)2010-06-171-1/+0
| | | | | | | | has been removed.
* | Fix a bunch of minor spelling mistakesEvgeniy Dolzhenko2010-06-159-9/+9
|\ \ | |/ |/|
| * Fix a bunch of minor spelling mistakesEvgeniy Dolzhenko2010-06-119-9/+9
| |
* | 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>