Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge commit 'mainstream/master' | Pratik Naik | 2008-07-28 | 46 | -176/+2011 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: actionpack/lib/action_controller/cookies.rb actionpack/lib/action_controller/streaming.rb actionpack/lib/action_controller/test_case.rb actionpack/lib/action_view/base.rb actionpack/lib/action_view/helpers/date_helper.rb actionpack/lib/action_view/helpers/debug_helper.rb actionpack/lib/action_view/helpers/form_options_helper.rb actionpack/lib/action_view/helpers/javascript_helper.rb activerecord/lib/active_record/associations.rb activerecord/lib/active_record/validations.rb activeresource/README activesupport/lib/active_support/core_ext/hash/reverse_merge.rb activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/data_timezone_info.rb activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/timezone.rb railties/doc/guides/actionview/helpers.markdown railties/doc/guides/actionview/partials.markdown railties/doc/guides/activerecord/basics.markdown | ||||
| * | Added config.dependency_loading to enable or disable the dependency loader ↵ | Joshua Peek | 2008-07-24 | 2 | -19/+71 |
| | | | | | | | | after initialization | ||||
| * | Extract ActiveSupport::TypedArray class to ensure an array is all of the ↵ | Joshua Peek | 2008-07-22 | 3 | -0/+83 |
| | | | | | | | | same type [#673 state:resolved] | ||||
| * | Improved Memoizable test coverage and added support for multiple arguments | Joshua Peek | 2008-07-22 | 3 | -61/+165 |
| | | |||||
| * | If it doesn't overflow, it won't have a .start method. So don't run the ↵ | Michael Koziarski | 2008-07-20 | 1 | -1/+1 |
| | | | | | | | | second assertion either | ||||
| * | Handle the case where 64bit time_t won't overflow. | Michael Koziarski | 2008-07-20 | 1 | -1/+6 |
| | | |||||
| * | Refactor ActiveSupport::Dependencies injector so it would be possible to ↵ | Joshua Peek | 2008-07-19 | 1 | -104/+114 |
| | | | | | | | | disable it | ||||
| * | Fix some warnings in i18n lib | Joshua Peek | 2008-07-19 | 2 | -5/+5 |
| | | |||||
| * | Undefine old run method | Joshua Peek | 2008-07-19 | 1 | -0/+3 |
| | | |||||
| * | Ruby 1.9: Ensure Memoizable#freeze is only overriden once to avoid an ↵ | Joshua Peek | 2008-07-18 | 1 | -14/+12 |
| | | | | | | | | endless loop | ||||
| * | Changed ActiveSupport::Memoizable API to extend since it mainly adds the ↵ | Joshua Peek | 2008-07-18 | 2 | -34/+63 |
| | | | | | | | | memoize class method | ||||
| * | Allow memoized methods to be reloaded and allow multiple symbols | Joshua Peek | 2008-07-18 | 2 | -28/+43 |
| | | |||||
| * | Decrease default benchmark runs from 10 to 4 | Jeremy Kemper | 2008-07-17 | 1 | -1/+1 |
| | | |||||
| * | Merge branch 'master' of git@github.com:rails/rails | Jeremy Kemper | 2008-07-17 | 2 | -21/+82 |
| |\ | |||||
| | * | 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 | 2 | -21/+78 |
| | | | |||||
| * | | Merge branch 'master' into i18n-merge | Jeremy Kemper | 2008-07-17 | 28 | -55/+191 |
| |\| | | | | | | | | | | | | | | | | | | | 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 | 2 | -0/+26 |
| | | | | | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| | * | Revert "Hash#slice supports an array of keys [#613 state:resolved]" | Pratik Naik | 2008-07-17 | 2 | -36/+21 |
| | | | | | | | | | | | | This reverts commit 396f9df8916b71f83aad8d56559cf55fc8501679. | ||||
| | * | Revert "Run callbacks from object's metaclass" | Joshua Peek | 2008-07-16 | 3 | -35/+1 |
| | | | |||||
| | * | Allow deep merging of hash values for nested with_options. [#490 state:resolved] | Lawrence Pit | 2008-07-17 | 5 | -10/+63 |
| | | | | | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| | * | Hash#slice supports an array of keys [#613 state:resolved] | Josh Owens | 2008-07-16 | 2 | -21/+36 |
| | | | | | | | | | | | | 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 | 3 | -1/+35 |
| | | | |||||
| | * | Added Object#metaclass | Joshua Peek | 2008-07-15 | 3 | -0/+17 |
| | | | |||||
| * | | make i18n date/time tests timezone independent | Sven Fuchs | 2008-07-16 | 1 | -10/+10 |
| | | | |||||
| * | | 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 | 28 | -82/+620 |
| |\| | |||||
| | * | Add in_groups to ActiveSupport::CoreExtensions::Array::Grouping. [#579 ↵ | Adrian Mugnolo | 2008-07-15 | 3 | -6/+97 |
| | | | | | | | | | | | | | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| | * | Fix TimeWithZone unmarshaling: coerce unmarshaled Time instances to utc, ↵ | gbuesing | 2008-07-14 | 3 | -1/+9 |
| | | | | | | | | | | | | 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 | 2 | -2/+8 |
| | | | | | | | | | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
| | * | memorize typo | Joshua Peek | 2008-07-14 | 2 | -5/+5 |
| | | | |||||
| | * | Added Memoizable mixin for caching simple lazy loaded attributes | Joshua Peek | 2008-07-14 | 4 | -0/+80 |
| | | | |||||
| | * | 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 |
| | | | |||||
| * | | align with changes in i18n | Sven Fuchs | 2008-07-06 | 3 | -10/+7 |
| | | | |||||
| * | | remove core extensions in favor of I18n#translate and I18n#localize | Sven Fuchs | 2008-07-02 | 4 | -76/+76 |
| | | | |||||
| * | | Fixed Date and Time localization for ActiveSupport | Luca Guidi | 2008-07-02 | 2 | -0/+96 |
| | | | |||||
| * | | crap, an array never has a request, stupid. | Sven Fuchs | 2008-06-22 | 1 | -1/+1 |
| | | | |||||
| * | | remove DeprecatedConstantToMethodProxy again | Sven Fuchs | 2008-06-22 | 1 | -17/+0 |
| | | | |||||
| * | | experimental DeprecatedConstantToMethodProxy | Sven Fuchs | 2008-06-21 | 1 | -0/+17 |
| | | | |||||
| * | | incorporate #translate usage with several default keys | Sven Fuchs | 2008-06-21 | 1 | -0/+0 |
| | | | | | | | | | | | | | | | (use first default key that resolves to a translation). this might, depending on the backend implementation save some expensive lookups (like db lookups) | ||||
| * | | Renamed lang/ to locale/ because that's what we seem to | Sven Fuchs | 2008-06-21 | 2 | -1/+1 |
| | | | | | | | | | | | | | | | | | | standarize on. Also, in future this place can be used for data/code that's not literally translations but conceptually belongs to the locale (like custom pluralization algorithms etc.). | ||||
| * | | Changed process of storing translations from the | Sven Fuchs | 2008-06-21 | 3 | -2/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | client libraries to the backend: clients now can pass a block to backend#populate which can contain code to load and register translations. This makes sense for backends that persist their translations (e.g. to db) so the repeated loading and passing of translations throughout the server startup would be wasted resources. | ||||
| * | | rename Backend::Simple#add_translations to set_translations | Sven Fuchs | 2008-06-20 | 2 | -1/+1 |
| | | | | | | | | | | | | because it overwrites existing translations | ||||
| * | | I18n has not been released as a gem, yet | Sven Fuchs | 2008-06-19 | 1 | -5/+6 |
| | | | |||||
| * | | add lang file for active_support | Sven Fuchs | 2008-06-19 | 2 | -0/+8 |
| | | |