Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Allow tests to proceed as soon as the payload changes, instead of always ↵ | wycats | 2011-02-20 | 1 | -15/+37 |
| | | | | having to wait for a timeout | ||||
* | Add tests for an FSSM backend for the file system watcher using the FSSM ↵ | wycats | 2011-02-20 | 1 | -0/+153 |
| | | | | polling support. | ||||
* | added Range#count? for Ruby 1.8 | Diego Carrion | 2011-02-19 | 3 | -0/+16 |
| | | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | ||||
* | merges docrails | Xavier Noria | 2011-02-18 | 1 | -1/+1 |
|\ | |||||
| * | Correct bad wording in description. | Ben Orenstein | 2011-02-14 | 1 | -1/+1 |
| | | |||||
* | | WeakHash is not used, remove it. | Emilio Tagua | 2011-02-18 | 2 | -74/+0 |
| | | |||||
* | | Merge remote branch 'rails/master' into identity_map | Emilio Tagua | 2011-02-18 | 5 | -5/+13 |
|\ \ | | | | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/associations/association.rb activerecord/lib/active_record/fixtures.rb | ||||
| * | | Remove unused line in test setup. | Ben Orenstein | 2011-02-17 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | | | [#6442 state:committed] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | ||||
| * | | handle double pluralization for irregular plurals | Dan Pickett | 2011-02-16 | 3 | -0/+12 |
| | | | | | | | | | | | | | | | | | | [#6363] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | ||||
| * | | Remove unused code. | Ben Orenstein | 2011-02-16 | 1 | -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 Nimety | 2011-02-15 | 1 | -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_map | Emilio Tagua | 2011-02-15 | 54 | -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 AS | Santiago Pastorino | 2011-02-13 | 2 | -0/+16 |
| | | | |||||
| * | | Updated the json date regex to recognize xmlschema formatted date times ↵ | Josh Kalderimis | 2011-02-12 | 2 | -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 Kalderimis | 2011-02-11 | 4 | -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 Kalderimis | 2011-02-10 | 2 | -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é Valim | 2011-02-10 | 2 | -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 Kalderimis | 2011-02-10 | 2 | -75/+0 |
| | | | | | | | | | | | | the same same. | ||||
| * | | Corrected the html_safe implementation for Array. Moved the html safe ↵ | Josh Kalderimis | 2011-02-10 | 2 | -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 Array | Paul Hieromnimon | 2011-02-10 | 2 | -0/+60 |
| | | | |||||
| * | | fanout unsubscribe only accepted one argument, so taking *args here is ↵ | Aaron Patterson | 2011-02-09 | 1 | -2/+2 |
| | | | | | | | | | | | | probably bad | ||||
| * | | just use an attr_accessor so we do not pay ||= on every notification call | Aaron Patterson | 2011-02-09 | 2 | -7/+10 |
| | | | |||||
| * | | fixing indentation | Aaron Patterson | 2011-02-09 | 1 | -4/+4 |
| | | | |||||
| * | | speed up notification publishing by writing the delegate method | Aaron Patterson | 2011-02-09 | 1 | -1/+4 |
| | | | |||||
| * | | Add missing require | Santiago Pastorino and Emilio Tagua | 2011-02-09 | 1 | -1/+2 |
| | | | |||||
| * | | fix for AS Gzip returning a UTF-8 string in Ruby 1.9 when it is actually ↵ | Josh Kalderimis | 2011-02-09 | 2 | -0/+14 |
| | | | | | | | | | | | | | | | | | | binary [#6386 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
| * | | use === so that regular expressions are not required | Aaron Patterson | 2011-02-08 | 1 | -5/+4 |
| | | | |||||
| * | | use === so that regular expressions are not required | Aaron Patterson | 2011-02-08 | 2 | -6/+12 |
| | | | |||||
| * | | notifier should be saved and re-set, not deleted | Aaron Patterson | 2011-02-07 | 1 | -1/+2 |
| | | | |||||
| * | | Add initial FileWatcher implementation. The Backend is just an abstract ↵ | wycats | 2011-02-06 | 3 | -0/+107 |
| |/ | | | | | | | implementation, which will be inherited by backends that do the heavy lifting. | ||||
| * | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-02-05 | 1 | -4/+8 |
| |\ | |||||
| | * | Change Time.zone= docs. | Brian Morearty | 2011-02-04 | 1 | -4/+8 |
| | | | | | | | | | | | | | | | Update the example to show how to reset the current thread's Time.zone upon exiting a request. | ||||
| * | | Remove stupid mistake | Santiago Pastorino | 2011-02-04 | 1 | -1/+0 |
| | | | |||||
| * | | git am is better here | Santiago Pastorino | 2011-02-04 | 1 | -0/+1 |
| | | | |||||
| * | | just < 1.9 is fine and 1.9.1 is not supported | Santiago Pastorino | 2011-02-03 | 1 | -3/+3 |
| | | | |||||
| * | | fix OrderedHash#each* methods to return Enumerators when called without a ↵ | Gabriel Horner | 2011-02-03 | 2 | -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 Firebaugh | 2011-02-03 | 2 | -35/+3 |
| | | | | | | | | | | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | ||||
| * | | Preserve fractional seconds in DateTime#to_time | John Firebaugh | 2011-02-03 | 2 | -1/+3 |
| | | | | | | | | | | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | ||||
| * | | Fix tests providing valid JSON | Santiago Pastorino | 2011-02-02 | 1 | -2/+2 |
| |/ | |||||
| * | Fix JSON decoding of newline character with Yaml backend [#3479 state:resolved] | Maxime RETY | 2011-02-02 | 2 | -3/+11 |
| | | | | | | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | ||||
| * | OrderedHash#each* methods return self like Hash does [#6364 state:resolved] | Gabriel Horner | 2011-02-02 | 2 | -3/+6 |
| | | | | | | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | ||||
| * | Ensure I18n setup is only executed once if triggered on eager loading [#6353 ↵ | Saimon Moore | 2011-02-01 | 1 | -12/+20 |
| | | | | | | | | | | | | state:resolved] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | ||||
| * | Additionally trigger i18n configuration setup before any eager loading ↵ | Saimon Moore | 2011-02-01 | 1 | -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 Firebaugh | 2011-01-31 | 3 | -6/+6 |
| | | | | | | | | | | | | public interface. Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | ||||
| * | make sure we play nicely when syck is activated | Aaron Patterson | 2011-01-28 | 2 | -5/+30 |
| | | |||||
| * | Psych correctly gets visitor for SafeBuffer from superclass | brainopia | 2011-01-28 | 1 | -2/+5 |
| | | |||||
| * | Remove unneeded yaml_as declaration | brainopia | 2011-01-28 | 1 | -2/+0 |
| | | |||||
| * | load psych by default if possible | Aaron Patterson | 2011-01-28 | 1 | -0/+5 |
| | | |||||
| * | use ! " " YAML string literal syntax rather than removing both quotes | Aaron Patterson | 2011-01-21 | 2 | -7/+5 |
| | | |||||
| * | prefering psych as the yaml parser if possible, fixing assertions for YAML ↵ | Aaron Patterson | 2011-01-21 | 3 | -2/+18 |
| | | | | | | | | 1.1 compatibility |