aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'mainstream/master'Pratik Naik2008-07-2846-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 Peek2008-07-242-19/+71
| | | | | | | | after initialization
| * Extract ActiveSupport::TypedArray class to ensure an array is all of the ↵Joshua Peek2008-07-223-0/+83
| | | | | | | | same type [#673 state:resolved]
| * Improved Memoizable test coverage and added support for multiple argumentsJoshua Peek2008-07-223-61/+165
| |
| * If it doesn't overflow, it won't have a .start method. So don't run the ↵Michael Koziarski2008-07-201-1/+1
| | | | | | | | second assertion either
| * Handle the case where 64bit time_t won't overflow.Michael Koziarski2008-07-201-1/+6
| |
| * Refactor ActiveSupport::Dependencies injector so it would be possible to ↵Joshua Peek2008-07-191-104/+114
| | | | | | | | disable it
| * Fix some warnings in i18n libJoshua Peek2008-07-192-5/+5
| |
| * Undefine old run methodJoshua Peek2008-07-191-0/+3
| |
| * Ruby 1.9: Ensure Memoizable#freeze is only overriden once to avoid an ↵Joshua Peek2008-07-181-14/+12
| | | | | | | | endless loop
| * Changed ActiveSupport::Memoizable API to extend since it mainly adds the ↵Joshua Peek2008-07-182-34/+63
| | | | | | | | memoize class method
| * Allow memoized methods to be reloaded and allow multiple symbolsJoshua Peek2008-07-182-28/+43
| |
| * Decrease default benchmark runs from 10 to 4Jeremy Kemper2008-07-171-1/+1
| |
| * Merge branch 'master' of git@github.com:rails/railsJeremy Kemper2008-07-172-21/+82
| |\
| | * Allow ActiveSupport::Cache logger to be silencedJoshua Peek2008-07-171-2/+6
| | |
| | * Cleanup ActiveSupport::Cache::ThreadSafety module and add test coverageJoshua Peek2008-07-172-21/+78
| | |
| * | Merge branch 'master' into i18n-mergeJeremy Kemper2008-07-1728-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. #613MatthewRudy2008-07-172-0/+26
| | | | | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| | * Revert "Hash#slice supports an array of keys [#613 state:resolved]"Pratik Naik2008-07-172-36/+21
| | | | | | | | | | | | This reverts commit 396f9df8916b71f83aad8d56559cf55fc8501679.
| | * Revert "Run callbacks from object's metaclass"Joshua Peek2008-07-163-35/+1
| | |
| | * Allow deep merging of hash values for nested with_options. [#490 state:resolved]Lawrence Pit2008-07-175-10/+63
| | | | | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| | * Hash#slice supports an array of keys [#613 state:resolved]Josh Owens2008-07-162-21/+36
| | | | | | | | | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com>
| | * MemCacheStore#decrement should use data instance variable not local variable ↵Joshua Peek2008-07-161-15/+15
| | | | | | | | | | | | [#521 state:resolved]
| | * Merge with docrails.Pratik Naik2008-07-1618-30/+70
| | |
| | * Run callbacks from object's metaclass [#575 state:resolved]Joshua Peek2008-07-153-1/+35
| | |
| | * Added Object#metaclassJoshua Peek2008-07-153-0/+17
| | |
| * | make i18n date/time tests timezone independentSven Fuchs2008-07-161-10/+10
| | |
| * | add i18n lib filesSven Fuchs2008-07-1610-0/+1064
| | |
| * | remove i18n lib subprojectSven Fuchs2008-07-161-0/+0
| | |
| * | merge forward to current rails/masterSven Fuchs2008-07-1628-82/+620
| |\|
| | * Add in_groups to ActiveSupport::CoreExtensions::Array::Grouping. [#579 ↵Adrian Mugnolo2008-07-153-6/+97
| | | | | | | | | | | | | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| | * Fix TimeWithZone unmarshaling: coerce unmarshaled Time instances to utc, ↵gbuesing2008-07-143-1/+9
| | | | | | | | | | | | because Ruby's marshaling of Time instances doesn't respect the zone
| | * Append a "_" to memoized instance variablesJoshua Peek2008-07-141-3/+4
| | |
| | * Some performance tweaks to ActiveSupport::MemoizableTarmo Tänav2008-07-142-2/+8
| | | | | | | | | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com>
| | * memorize typoJoshua Peek2008-07-142-5/+5
| | |
| | * Added Memoizable mixin for caching simple lazy loaded attributesJoshua Peek2008-07-144-0/+80
| | |
| | * Cache Module#parent_nameJeremy Kemper2008-07-141-6/+17
| | |
| | * Slightly faster DateTime#to_json. [#598 state:resolved] [Alex Zepeda]Pratik Naik2008-07-141-1/+1
| | |
| * | align with changes in i18nSven Fuchs2008-07-063-10/+7
| | |
| * | remove core extensions in favor of I18n#translate and I18n#localizeSven Fuchs2008-07-024-76/+76
| | |
| * | Fixed Date and Time localization for ActiveSupportLuca Guidi2008-07-022-0/+96
| | |
| * | crap, an array never has a request, stupid.Sven Fuchs2008-06-221-1/+1
| | |
| * | remove DeprecatedConstantToMethodProxy againSven Fuchs2008-06-221-17/+0
| | |
| * | experimental DeprecatedConstantToMethodProxySven Fuchs2008-06-211-0/+17
| | |
| * | incorporate #translate usage with several default keysSven Fuchs2008-06-211-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 toSven Fuchs2008-06-212-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 theSven Fuchs2008-06-213-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_translationsSven Fuchs2008-06-202-1/+1
| | | | | | | | | | | | because it overwrites existing translations
| * | I18n has not been released as a gem, yetSven Fuchs2008-06-191-5/+6
| | |
| * | add lang file for active_supportSven Fuchs2008-06-192-0/+8
| | |