aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote branch 'rails/master' into identity_mapEmilio Tagua2011-02-185-5/+13
|\ | | | | | | | | | | Conflicts: activerecord/lib/active_record/associations/association.rb activerecord/lib/active_record/fixtures.rb
| * Remove unused line in test setup.Ben Orenstein2011-02-171-1/+0
| | | | | | | | | | | | [#6442 state:committed] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
| * handle double pluralization for irregular pluralsDan Pickett2011-02-163-0/+12
| | | | | | | | | | | | [#6363] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
| * Remove unused code.Ben Orenstein2011-02-161-3/+0
| | | | | | | | | | | | [#6437 state:committed] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
| * GcTime incorrectly checks GC.respond_to?(:total_time), it should check ↵Joel Nimety2011-02-151-1/+1
| | | | | | | | | | | | | | | | GC::Profiler.respond_to?(:total_time) [#6435 state:committed] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
* | Merge remote branch 'rails/master' into identity_mapEmilio Tagua2011-02-1554-313/+750
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: activerecord/examples/performance.rb activerecord/lib/active_record/association_preload.rb activerecord/lib/active_record/associations.rb activerecord/lib/active_record/associations/association_proxy.rb activerecord/lib/active_record/autosave_association.rb activerecord/lib/active_record/base.rb activerecord/lib/active_record/nested_attributes.rb activerecord/test/cases/relations_test.rb
| * Add Date#rfc3339 and Date#iso8601 to ASSantiago Pastorino2011-02-132-0/+16
| |
| * Updated the json date regex to recognize xmlschema formatted date times ↵Josh Kalderimis2011-02-122-1/+5
| | | | | | | | | | | | during json decoding. [#3031 state:resolved] Signed-off-by: Santiago Pastorino and Emilio Tagua <santiago+emilioe@wyeworks.com>
| * Fixes an issue when decoding a json string which looks like a date but is ↵Josh Kalderimis2011-02-114-3/+23
| | | | | | | | | | | | invalid. This DateTime parse error is now caught and the original string is instead passed back [#6286 state:resolved] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
| * Removed Array#safe_join in AS core_ext and moved it to a view helper with ↵Josh Kalderimis2011-02-102-75/+0
| | | | | | | | | | | | the same same. This also changes how safe_join works, if items or the separator are not html_safe they are html_escape'd, a html_safe string is always returned. Signed-off-by: José Valim <jose.valim@gmail.com>
| * Revert "Removed Array#safe_join in AS core_ext and moved it to a view helper ↵José Valim2011-02-102-0/+75
| | | | | | | | | | | | | | | | with the same same." Applied the wrong version. This reverts commit 98c0c5db50a7679b3d58769ac22cb0a27a62c930.
| * Removed Array#safe_join in AS core_ext and moved it to a view helper with ↵Josh Kalderimis2011-02-102-75/+0
| | | | | | | | the same same.
| * Corrected the html_safe implementation for Array. Moved the html safe ↵Josh Kalderimis2011-02-102-20/+35
| | | | | | | | version of join to its own method (safe_join) as not to degrade the performance of join for unrelated html_safe use. [#6298 state:resolved]
| * Initial html_safe implemention for ArrayPaul Hieromnimon2011-02-102-0/+60
| |
| * fanout unsubscribe only accepted one argument, so taking *args here is ↵Aaron Patterson2011-02-091-2/+2
| | | | | | | | probably bad
| * just use an attr_accessor so we do not pay ||= on every notification callAaron Patterson2011-02-092-7/+10
| |
| * fixing indentationAaron Patterson2011-02-091-4/+4
| |
| * speed up notification publishing by writing the delegate methodAaron Patterson2011-02-091-1/+4
| |
| * Add missing requireSantiago Pastorino and Emilio Tagua2011-02-091-1/+2
| |
| * fix for AS Gzip returning a UTF-8 string in Ruby 1.9 when it is actually ↵Josh Kalderimis2011-02-092-0/+14
| | | | | | | | | | | | binary [#6386 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
| * use === so that regular expressions are not requiredAaron Patterson2011-02-081-5/+4
| |
| * use === so that regular expressions are not requiredAaron Patterson2011-02-082-6/+12
| |
| * notifier should be saved and re-set, not deletedAaron Patterson2011-02-071-1/+2
| |
| * Add initial FileWatcher implementation. The Backend is just an abstract ↵wycats2011-02-063-0/+107
| | | | | | | | implementation, which will be inherited by backends that do the heavy lifting.
| * Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-02-051-4/+8
| |\
| | * Change Time.zone= docs.Brian Morearty2011-02-041-4/+8
| | | | | | | | | | | | | | | Update the example to show how to reset the current thread's Time.zone upon exiting a request.
| * | Remove stupid mistakeSantiago Pastorino2011-02-041-1/+0
| | |
| * | git am is better hereSantiago Pastorino2011-02-041-0/+1
| | |
| * | just < 1.9 is fine and 1.9.1 is not supportedSantiago Pastorino2011-02-031-3/+3
| | |
| * | fix OrderedHash#each* methods to return Enumerators when called without a ↵Gabriel Horner2011-02-032-0/+9
| | | | | | | | | | | | | | | | | | block [#6366 state:resolved] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
| * | Ruby 1.8.7+ provides to_date/to_datetime, AS just makes them public.John Firebaugh2011-02-032-35/+3
| | | | | | | | | | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
| * | Preserve fractional seconds in DateTime#to_timeJohn Firebaugh2011-02-032-1/+3
| | | | | | | | | | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
| * | Fix tests providing valid JSONSantiago Pastorino2011-02-021-2/+2
| |/
| * Fix JSON decoding of newline character with Yaml backend [#3479 state:resolved]Maxime RETY2011-02-022-3/+11
| | | | | | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
| * OrderedHash#each* methods return self like Hash does [#6364 state:resolved]Gabriel Horner2011-02-022-3/+6
| | | | | | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
| * Ensure I18n setup is only executed once if triggered on eager loading [#6353 ↵Saimon Moore2011-02-011-12/+20
| | | | | | | | | | | | state:resolved] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
| * Additionally trigger i18n configuration setup before any eager loading ↵Saimon Moore2011-02-011-4/+11
| | | | | | | | | | | | | | | | | | [#6353 state:resolved] This handles the case where config.cache_classes is true and classes are loaded before the I18n load path has had a chance to be populated. Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
| * Use run_callbacks; the generated _run_<name>_callbacks method is not a ↵John Firebaugh2011-01-313-6/+6
| | | | | | | | | | | | public interface. Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
| * make sure we play nicely when syck is activatedAaron Patterson2011-01-282-5/+30
| |
| * Psych correctly gets visitor for SafeBuffer from superclassbrainopia2011-01-281-2/+5
| |
| * Remove unneeded yaml_as declarationbrainopia2011-01-281-2/+0
| |
| * load psych by default if possibleAaron Patterson2011-01-281-0/+5
| |
| * use ! " " YAML string literal syntax rather than removing both quotesAaron Patterson2011-01-212-7/+5
| |
| * prefering psych as the yaml parser if possible, fixing assertions for YAML ↵Aaron Patterson2011-01-213-2/+18
| | | | | | | | 1.1 compatibility
| * fixing psych support in big decimal, fixing tests to support YAML 1.1Aaron Patterson2011-01-212-4/+11
| |
| * Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-01-201-113/+116
| |\
| | * editing comments regarding rescuable optoin in AS callbacksNeeraj Singh2011-01-121-2/+3
| | |
| | * Expand and clarify AS::Callbacks docs.John Firebaugh2011-01-091-113/+115
| | |
| | * Revert "Update CHANGELOGs to include 3.0.3 changes"Xavier Noria2011-01-021-9/+1
| | | | | | | | | | | | | | | | | | | | | Reason: Sorry, CHANGELOGs can only be edited in master. If you provide a patch I'll apply it myself. Thanks! This reverts commit 1f8ecb85d7c1b3efdf45c3cf3461502b608c1a7c.
| | * Update CHANGELOGs to include 3.0.3 changesPrem Sichanugrist2011-01-021-1/+9
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 17:17:40 +0000