Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of git@github.com:rails/rails | Jeremy Kemper | 2008-07-17 | 1 | -21/+15 |
|\ | |||||
| * | Allow ActiveSupport::Cache logger to be silenced | Joshua Peek | 2008-07-17 | 1 | -2/+6 |
| | | |||||
| * | Cleanup ActiveSupport::Cache::ThreadSafety module and add test coverage | Joshua Peek | 2008-07-17 | 1 | -21/+11 |
| | | |||||
* | | Merge branch 'master' into i18n-merge | Jeremy Kemper | 2008-07-17 | 25 | -55/+125 |
|\| | | | | | | | | | | | | | Conflicts: actionpack/lib/action_view/helpers/form_options_helper.rb activerecord/lib/active_record/validations.rb | ||||
| * | Add extra tests to ensure Hash#slice works with an array as a key. #613 | MatthewRudy | 2008-07-17 | 1 | -0/+5 |
| | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | Revert "Hash#slice supports an array of keys [#613 state:resolved]" | Pratik Naik | 2008-07-17 | 1 | -1/+0 |
| | | | | | | | | This reverts commit 396f9df8916b71f83aad8d56559cf55fc8501679. | ||||
| * | Revert "Run callbacks from object's metaclass" | Joshua Peek | 2008-07-16 | 1 | -9/+1 |
| | | |||||
| * | Allow deep merging of hash values for nested with_options. [#490 state:resolved] | Lawrence Pit | 2008-07-17 | 3 | -10/+26 |
| | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | Hash#slice supports an array of keys [#613 state:resolved] | Josh Owens | 2008-07-16 | 1 | -0/+1 |
| | | | | | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
| * | MemCacheStore#decrement should use data instance variable not local variable ↵ | Joshua Peek | 2008-07-16 | 1 | -15/+15 |
| | | | | | | | | [#521 state:resolved] | ||||
| * | Merge with docrails. | Pratik Naik | 2008-07-16 | 18 | -30/+70 |
| | | |||||
| * | Run callbacks from object's metaclass [#575 state:resolved] | Joshua Peek | 2008-07-15 | 1 | -1/+9 |
| | | |||||
| * | Added Object#metaclass | Joshua Peek | 2008-07-15 | 2 | -0/+9 |
| | | |||||
* | | add i18n lib files | Sven Fuchs | 2008-07-16 | 10 | -0/+1064 |
| | | |||||
* | | remove i18n lib subproject | Sven Fuchs | 2008-07-16 | 1 | -0/+0 |
| | | |||||
* | | merge forward to current rails/master | Sven Fuchs | 2008-07-16 | 19 | -65/+275 |
|\| | |||||
| * | Add in_groups to ActiveSupport::CoreExtensions::Array::Grouping. [#579 ↵ | Adrian Mugnolo | 2008-07-15 | 1 | -2/+45 |
| | | | | | | | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | Fix TimeWithZone unmarshaling: coerce unmarshaled Time instances to utc, ↵ | gbuesing | 2008-07-14 | 1 | -1/+1 |
| | | | | | | | | because Ruby's marshaling of Time instances doesn't respect the zone | ||||
| * | Append a "_" to memoized instance variables | Joshua Peek | 2008-07-14 | 1 | -3/+4 |
| | | |||||
| * | Some performance tweaks to ActiveSupport::Memoizable | Tarmo Tänav | 2008-07-14 | 1 | -2/+4 |
| | | | | | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
| * | memorize typo | Joshua Peek | 2008-07-14 | 1 | -3/+3 |
| | | |||||
| * | Added Memoizable mixin for caching simple lazy loaded attributes | Joshua Peek | 2008-07-14 | 2 | -0/+33 |
| | | |||||
| * | Cache Module#parent_name | Jeremy Kemper | 2008-07-14 | 1 | -6/+17 |
| | | |||||
| * | Slightly faster DateTime#to_json. [#598 state:resolved] [Alex Zepeda] | Pratik Naik | 2008-07-14 | 1 | -1/+1 |
| | | |||||
| * | Remove some Symbol#to_proc usage in runtime code. [#484 state:resolved] | Cheah Chu Yeow | 2008-07-09 | 3 | -4/+4 |
| | | |||||
| * | Move test related core_ext stuff out of regular core ext to prevent nasty ↵ | Michael Koziarski | 2008-07-04 | 4 | -9/+11 |
| | | | | | | | | surprises when you require active_support then use Test::Unit directly. | ||||
| * | Add Inflection rules for String#humanize. [#535 state:resolved] [dcmanges] | Pratik Naik | 2008-07-02 | 1 | -4/+18 |
| | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | TimeWithZone#advance: treat :weeks option as variable-length | gbuesing | 2008-06-29 | 1 | -2/+2 |
| | | |||||
| * | TimeWithZone: when crossing DST boundary, treat Durations of days, months or ↵ | gbuesing | 2008-06-29 | 1 | -12/+33 |
| | | | | | | | | years as variable-length, and all other values as absolute length. A time + 24.hours will advance exactly 24 hours, but a time + 1.day will advance 23-25 hours, depending on the day. Ensure consistent behavior across all advancing methods. | ||||
| * | Merge branch 'state_machine' | rick | 2008-06-29 | 1 | -0/+5 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some big changes: * Added some redundant requires so active_support/inflecto can be loaded without the rest of ActiveSupport. * Disabled callbacks and validations until they are added and tested. * Converted specs back to tests, using ActiveSupport::TestCase and the new #test helper. * As an experiment, I imported Scott Barron's awesome AASM gem into ActiveModel. I added multiple state machine support and vastly improved the API (no more aasm_* prefixes). All the old tests pass. If this bothers people, I have no problems removing this and contributing the changes back to AASM. I just feel like AMo is a better spot for all these 'modelish' features. | ||||
| | * | add special requires for ActiveSupport::Inflector so you can load it ↵ | rick | 2008-06-27 | 1 | -0/+5 |
| | | | | | | | | | | | | individually | ||||
| * | | Added support for regexp matching of priority zones in time_zone_select ↵ | Ernie Miller | 2008-06-29 | 1 | -0/+6 |
| | | | | | | | | | | | | [#195 state:resolved] | ||||
| * | | Fix typo in apparently-dead will_unload? method. | Jeremy Kemper | 2008-06-27 | 1 | -1/+1 |
| | | | |||||
| * | | Freeze ModelName cache_key also | Jeremy Kemper | 2008-06-25 | 1 | -1/+1 |
| | | | |||||
| * | | Include cache key in ModelName | Jeremy Kemper | 2008-06-24 | 1 | -2/+3 |
| | | | |||||
| * | | Performance: minor Array#to_param and #to_query speedups | Jeremy Kemper | 2008-06-24 | 1 | -2/+3 |
| | | | |||||
| * | | Revert "Check for mocha gem without requiring the lib. [#403 state:resolved]" | Jeremy Kemper | 2008-06-23 | 1 | -2/+2 |
| | | | | | | | | | | | | This reverts commit 4d5ac3f3d2e1667971752c9a4e536de1a5bec364. | ||||
| * | | Check for mocha gem without requiring the lib. [#403 state:resolved] | Jeremy Kemper | 2008-06-22 | 1 | -2/+2 |
| | | | |||||
| * | | Everything responds to #to_param | Jeremy Kemper | 2008-06-21 | 1 | -3/+1 |
| | | | |||||
| * | | Don't assume RubyProf constants are defined | Jeremy Kemper | 2008-06-20 | 1 | -5/+5 |
| | | | |||||
| * | | Added block-handling to Enumerable#many? (Damian Janowski) [#452 state:resolved] | David Heinemeier Hansson | 2008-06-20 | 1 | -1/+3 |
| | | | |||||
| * | | true#to_param => true, so be sure to #to_s expanded cache keys | Jeremy Kemper | 2008-06-20 | 1 | -9/+9 |
| | | | |||||
| * | | Tired of seeing <foo>/run | Jeremy Kemper | 2008-06-20 | 1 | -1/+1 |
| | | | |||||
| * | | Don't profile GC runs/time by default | Jeremy Kemper | 2008-06-20 | 1 | -1/+1 |
| | | | |||||
| * | | Fall back to #to_s for cache key expansion | Jeremy Kemper | 2008-06-20 | 1 | -1/+3 |
| |/ | |||||
| * | Performance: add GC metrics for # of runs and total runtime | Jeremy Kemper | 2008-06-18 | 1 | -10/+48 |
| | | |||||
| * | Oops, include metric name in csv filename | Jeremy Kemper | 2008-06-18 | 1 | -1/+1 |
| | | |||||
| * | Performance: tweak unsupported metric error message | Jeremy Kemper | 2008-06-18 | 1 | -1/+1 |
| | | |||||
| * | Write benchmark output to separate files per test+metric. Support Lloyd ↵ | Jeremy Kemper | 2008-06-18 | 1 | -5/+35 |
| | | | | | | | | Hilaiel's GC.heap_info patch for current heap size. | ||||
* | | align with changes in i18n | Sven Fuchs | 2008-07-06 | 2 | -4/+1 |
| | |