aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | Integrate nested support into ThroughAssociationScope, using my concept of ↵Jon Leighton2010-10-025-59/+107
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | generating a 'chain' of reflections to be joined. It seems to work at the moment, all existing tests are passing. There may be further complications as we add more test cases for nested associations, though.
| * | | | | | | | | | | | | Started implementing nested :through associations by using the existing ↵Jon Leighton2010-10-014-32/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | structure of ThroughAssociationScope rather than layering a module over the top
| * | | | | | | | | | | | | Prevent ↵Jon Leighton2010-09-301-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | test_has_many_through_a_has_many_through_association_on_through_reflection failing for me due to ordering of the results
| * | | | | | | | | | | | | Merge branch 'master' into nested_has_many_through_2Jon Leighton2010-09-30166-849/+1536
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Initial nested_has_many_through support [#1152]Bodaniel Jeanes2010-09-2610-15/+220
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Change behavior of count(:limit => x, :offset => y) to limit/offset before ↵John Mileham2011-03-033-25/+80
| |_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | counting.
* | | | | | | | | | | | | | 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.
| * | | | | | | | | | | | | 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
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | 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
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | 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
| | | | | | | | | | | | |
* | | | | | | | | | | | | removing limits and offsets from COUNT queries unless both are specified. ↵Aaron Patterson2011-02-254-1/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [#6268 state:resolved]
* | | | | | | | | | | | | only take the limit if there is a limit to takeAaron Patterson2011-02-251-1/+1
| |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |