aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Add a test for STI on the through where the through is nested, and change the...Jon Leighton2011-03-056-13/+46
* Stop identity-mapping the through records in the preloader since I fixed the ...Jon Leighton2011-03-041-5/+0
* Fix a couple of tests in join_model_test.rb which were failing when the ident...Jon Leighton2011-03-041-2/+2
* When preloading has_and_belongs_to_many associations, we should only instanti...Jon Leighton2011-03-042-2/+20
* 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
| * No need of instance variableDalibor Nasevic2011-03-021-3/+3
| * 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 alwa...Cheah Chu Yeow2011-03-022-3/+10
| * Fixed typos in asset_host_testDalibor Nasevic2011-03-021-2/+2
| * 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 t...Aaron Patterson2011-03-017-19/+185
| * initialize ivarsAaron Patterson2011-03-011-1/+1
| * Move ActiveModel::AttributeMethods#attribute_methods_generated? to ActiveReco...Alexander Uvarov2011-03-014-28/+39
| * 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
| * Revert "compute ext in initialize, and use an attr_reader"Aaron Patterson2011-02-281-5/+7
| * 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
| |\
| * | 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
|\ \ \ | | |/ | |/|
| * | Move JoinDependency and friends from ActiveRecord::Associations::ClassMethods...Jon Leighton2011-02-2811-626/+618
| * | Rewrote AssociationPreload.Jon Leighton2011-02-2821-458/+583
| |/
| * Updated the AS guides with some information on the difference between Date.to...Josh Kalderimis2011-02-281-1/+9
| * updated Time, Date and DateTime current methods in AS to use Time.zone and no...Josh Kalderimis2011-02-2810-47/+49
| * revises a few details in public/index.htmlXavier Noria2011-02-281-7/+9
| * Remove redundant to_sym call.Ben Orenstein2011-02-281-1/+1
| * skip this on oracleAaron Patterson2011-02-281-0/+2
| * Make ActiveSupport::Configurable work with modulesOriol Gual and Josep M. Bach2011-02-282-2/+8
| * added activesupport/test/tmp to gitignoreDiego Carrion2011-02-281-0/+1
| * javascript_include_tag shouldn't raise if you register an expansion key with ...Santiago Pastorino2011-02-283-4/+12
| * 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
| * 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 sta...Jeff Kreeftmeijer2011-02-271-1/+1
| * use an attribute rather than a SQL literalAaron Patterson2011-02-262-1/+2
| * removing limits and offsets from COUNT queries unless both are specified. [#6...Aaron Patterson2011-02-254-1/+51
| * only take the limit if there is a limit to takeAaron Patterson2011-02-251-1/+1