aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Use Base#type_condition in JoinAssociationJon Leighton2011-03-052-17/+6
|
* Push source_type and polymorphic conditions out of ThroughAssociation and ↵Jon Leighton2011-03-054-47/+13
| | | | JoinDependency::JoinAssociation and into the reflection instead.
* Add a test for STI on the through where the through is nested, and change ↵Jon Leighton2011-03-056-13/+46
| | | | the code which support this
* Stop identity-mapping the through records in the preloader since I fixed the ↵Jon Leighton2011-03-041-5/+0
| | | | underlying problem in the habtm preloader.
* Fix a couple of tests in join_model_test.rb which were failing when the ↵Jon Leighton2011-03-041-2/+2
| | | | identity map is turned off
* When preloading has_and_belongs_to_many associations, we should only ↵Jon Leighton2011-03-042-2/+20
| | | | instantiate one AR object per actual record in the database. (Even when IM is off.)
* Merge branch 'master' into nested_has_many_throughJon Leighton2011-03-045-9/+28
|\
| * only compute path.to_s onceAaron Patterson2011-03-021-1/+4
| |
| * remove to_s implementation so that inspect is helpfulAaron Patterson2011-03-021-1/+0
| |
| * * LocalCache strategy is now a real middleware class, not an anonymous classAaron Patterson2011-03-022-23/+32
| | | | | | | | posing for pictures.
| * No need of instance variableDalibor Nasevic2011-03-021-3/+3
| | | | | | | | | | | | [#6502 state:committed] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
| * require deprecation so that we can deprecate methods!Aaron Patterson2011-03-021-0/+1
| |
| * anonymous classes have blank names on ruby 1.8Aaron Patterson2011-03-021-1/+1
| |
| * make sure string keys are always looked up from the class cacheAaron Patterson2011-03-022-2/+28
| |
| * Ruby 1.8: Y U NO FUN?Aaron Patterson2011-03-021-1/+3
| |
| * use newer class cache apiAaron Patterson2011-03-021-1/+1
| |
| * adding deprecation noticies to deprecated class cache methodsAaron Patterson2011-03-023-7/+41
| |
| * adding backwards compat for class cache references. <3<3Aaron Patterson2011-03-023-8/+25
| |
| * Fix Action caching bug where an action that has a non-cacheable response ↵Cheah Chu Yeow2011-03-022-3/+10
| | | | | | | | | | | | | | | | | | | | always renders a nil response body. It now correctly renders the response body. Note that only GET and HTTP 200 responses can be cached. [#6480 state:committed] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
| * Fixed typos in asset_host_testDalibor Nasevic2011-03-021-2/+2
| | | | | | | | | | | | [#6501 state:committed] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
| * yo dawg, directly use the class cache rather than the cache of the cacheAaron Patterson2011-03-012-6/+4
| |
| * refactor Reference to a ClassCache object, fix lazy lookup in Middleware so ↵Aaron Patterson2011-03-017-19/+185
| | | | | | | | that anonymous classes are supported
| * initialize ivarsAaron Patterson2011-03-011-1/+1
| |
| * Move ActiveModel::AttributeMethods#attribute_methods_generated? to ↵Alexander Uvarov2011-03-014-28/+39
| | | | | | | | | | | | | | | | ActiveRecord, so it's flexible now [#6428 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
| * Enumerable gives us include?, so remove include?Aaron Patterson2011-03-011-4/+0
| |
| * prefer composition over inheritance with AD::MSAaron Patterson2011-03-013-9/+42
| |
| * fixing test case test on 1.9.3devAaron Patterson2011-03-011-0/+4
| |
| * Remove warnings about redefined test methodsSam Elliott2011-03-011-4/+4
| | | | | | | | | | | | [#6490 state:committed] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
| * Revert "compute ext in initialize, and use an attr_reader"Aaron Patterson2011-02-281-5/+7
| | | | | | | | | | | | | | | | This reverts commit 2dbb73bdda3b81947fd112486ac4285fb1a6e3a9. Conflicts: actionpack/lib/action_dispatch/middleware/static.rb
| * no need to pass a regex to Regexp.compileAaron Patterson2011-02-281-4/+4
| |
| * compute ext in initialize, and use an attr_readerAaron Patterson2011-02-281-7/+5
| |
| * Merge branch 'fuuu'Aaron Patterson2011-02-2831-1083/+1200
| |\ | | | | | | | | | | | | | | | * fuuu: Move JoinDependency and friends from ActiveRecord::Associations::ClassMethods to just ActiveRecord::Associations Rewrote AssociationPreload.
| * | use a subclass of AS::TZ for testing html outputAaron Patterson2011-02-281-4/+11
| | |
| * | reduce two method calls per request, 1 to method_missing and one to sendAaron Patterson2011-02-281-0/+4
| | |
* | | Merge branch 'master' into nested_has_many_throughJon Leighton2011-03-04584-13369/+18299
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | Move JoinDependency and friends from ↵Jon Leighton2011-02-2811-626/+618
| | | | | | | | | | | | ActiveRecord::Associations::ClassMethods to just ActiveRecord::Associations
| * | Rewrote AssociationPreload.Jon Leighton2011-02-2821-458/+583
| |/
| * Updated the AS guides with some information on the difference between ↵Josh Kalderimis2011-02-281-1/+9
| | | | | | | | Date.today and Date.current.
| * updated Time, Date and DateTime current methods in AS to use Time.zone and ↵Josh Kalderimis2011-02-2810-47/+49
| | | | | | | | | | | | not Time.zone_default. [#6410 state:committed]
| * revises a few details in public/index.htmlXavier Noria2011-02-281-7/+9
| |
| * Remove redundant to_sym call.Ben Orenstein2011-02-281-1/+1
| | | | | | | | | | | | [#6483 state:committed] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
| * skip this on oracleAaron Patterson2011-02-281-0/+2
| |
| * Make ActiveSupport::Configurable work with modulesOriol Gual and Josep M. Bach2011-02-282-2/+8
| | | | | | | | | | | | [#6486 state:committed] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
| * added activesupport/test/tmp to gitignoreDiego Carrion2011-02-281-0/+1
| | | | | | | | | | | | [#6484 state:committed] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
| * javascript_include_tag shouldn't raise if you register an expansion key with ↵Santiago Pastorino2011-02-283-4/+12
| | | | | | | | nil value
| * Add tests for register expansion methods with key = []Santiago Pastorino2011-02-281-2/+12
| |
| * Revert "Properly interpolate i18n keys in modules [#5572 state:resolved]"Santiago Pastorino2011-02-275-37/+8
| | | | | | | | | | | | | | This breaks #6448, you should use :"module/class" as key for namespacing [#6448 state:committed] This reverts commit 8d30193b08bd2321a7a78a1f481bd5e4d4d45557.
| * failing test for i18n key collision with namespaced modelsSantiago Pastorino2011-02-272-0/+11
| |
| * Make sure the Thor generator LoadError does not output --dev twice [#6431 ↵Jeff Kreeftmeijer2011-02-271-1/+1
| | | | | | | | | | | | state:resolved] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
| * use an attribute rather than a SQL literalAaron Patterson2011-02-262-1/+2
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-15 16:33:55 +0000