| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
activerecord/CHANGELOG
activerecord/lib/active_record/association_preload.rb
activerecord/lib/active_record/associations.rb
activerecord/lib/active_record/associations/class_methods/join_dependency.rb
activerecord/lib/active_record/associations/class_methods/join_dependency/join_association.rb
activerecord/lib/active_record/associations/has_many_association.rb
activerecord/lib/active_record/associations/has_many_through_association.rb
activerecord/lib/active_record/associations/has_one_association.rb
activerecord/lib/active_record/associations/has_one_through_association.rb
activerecord/lib/active_record/associations/through_association_scope.rb
activerecord/lib/active_record/reflection.rb
activerecord/test/cases/associations/has_many_through_associations_test.rb
activerecord/test/cases/associations/has_one_through_associations_test.rb
activerecord/test/cases/reflection_test.rb
activerecord/test/cases/relations_test.rb
activerecord/test/fixtures/memberships.yml
activerecord/test/models/categorization.rb
activerecord/test/models/category.rb
activerecord/test/models/member.rb
activerecord/test/models/reference.rb
activerecord/test/models/tagging.rb
|
| |
| |
| |
| |
| |
| | |
not Time.zone_default.
[#6410 state:committed]
|
| |
| |
| |
| |
| |
| | |
[#6483 state:committed]
Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
|
| |
| |
| |
| |
| |
| | |
[#6486 state:committed]
Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
|
| | |
|
| |
| |
| |
| | |
Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
|
| |\ |
|
| | | |
|
| | | |
|
| | | |
|
| | | |
|
| | |
| | |
| | |
| | | |
having to wait for a timeout
|
| | |
| | |
| | |
| | | |
polling support.
|
| |/
| |
| |
| | |
Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
|
| |\ |
|
| | | |
|
| | | |
|
| |\ \
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
activerecord/lib/active_record/associations/association.rb
activerecord/lib/active_record/fixtures.rb
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
[#6442 state:committed]
Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
[#6363]
Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
[#6437 state:committed]
Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
GC::Profiler.respond_to?(:total_time)
[#6435 state:committed]
Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
|
| |\| |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
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
|
| | | | |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
during json decoding. [#3031 state:resolved]
Signed-off-by: Santiago Pastorino and Emilio Tagua <santiago+emilioe@wyeworks.com>
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
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>
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
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>
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
with the same same."
Applied the wrong version.
This reverts commit 98c0c5db50a7679b3d58769ac22cb0a27a62c930.
|
| | | |
| | | |
| | | |
| | | | |
the same same.
|
| | | |
| | | |
| | | |
| | | | |
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]
|
| | | | |
|
| | | |
| | | |
| | | |
| | | | |
probably bad
|
| | | | |
|
| | | | |
|
| | | | |
|
| | | | |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
binary [#6386 state:resolved]
Signed-off-by: José Valim <jose.valim@gmail.com>
|
| | | | |
|
| | | | |
|
| | | | |
|
| | |/
| | |
| | |
| | | |
implementation, which will be inherited by backends that do the heavy lifting.
|
| | |\ |
|
| | | |
| | | |
| | | |
| | | |
| | | | |
Update the example to show how to reset the current thread's
Time.zone upon exiting a request.
|
| | | | |
|
| | | | |
|
| | | | |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
block [#6366 state:resolved]
Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
|
| | | |
| | | |
| | | |
| | | | |
Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
|
| | | |
| | | |
| | | |
| | | | |
Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
|
| | |/ |
|