aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| |
| * 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
| |
| * Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-02-2513-86/+83
| |\
| | * standardize all shell commands with the $ prefixVijay Dev2011-02-2512-78/+78
| | |
| | * Fix missing inheritance from AR::Base in docsJosep M. Bach2011-02-241-1/+1
| | |
| | * Fixing wrong class name.Rodrigo Navarro2011-02-231-1/+1
| | |
| | * ActiveModel::Validator#validate must receive have a record parameter.Rodrigo Navarro2011-02-231-6/+3
| | |
| * | Always use ActionDispatch::ShowExceptions middleware [#6462 state:resolved]Prem Sichanugrist2011-02-253-3/+40
| | | | | | | | | | | | This will make sure the application will raise `ActionController::RoutingError` in case "X-Cascade: pass" header was set, usually when there's no route match.
| * | Make sure that we set `env["action_dispatch.show_exceptions"]`Prem Sichanugrist2011-02-252-1/+17
| | | | | | | | | | | | This has been used by `show_exception` middleware even the setting wasn't get passed to `env` hash.
| * | fixes: ActiveRecord::Base.scopes includes all scopes defined in all subclassesEric Allam2011-02-242-2/+7
| | |
| * | observers leak across tests, so rather than modify the object, we should ↵Aaron Patterson2011-02-231-6/+12
| | | | | | | | | | | | just count the number of times the observer was called
| * | Removing redundant File.expand_path from generators testVinicius Baggio2011-02-231-1/+1
| | | | | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com>
| * | Fix observer callbacks firing multiple times on descendant instancesKamal Fariz Mahyuddin2011-02-222-1/+22
| | |
| * | Fix tests on 1.8.José Valim2011-02-222-27/+8
| | |
| * | We're in 2011, let's update our licensePrem Sichanugrist2011-02-2213-13/+13
| | | | | | | | | | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
| * | Prepend the CSRF filter to make it much more difficult to execute ↵Michael Koziarski2011-02-231-1/+1
| | | | | | | | | | | | application code before it fires.
| * | expectations change when using IM. Change oracle tests to reflect thatAaron Patterson2011-02-221-2/+6
| | |
| * | Relation will delegate to AR::Base which already uses the Dynamic finders, ↵Aaron Patterson2011-02-221-8/+3
| |/ | | | | | | so eliminate duplicate calls
| * Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-02-222-2/+2
| |\
| | * alteracao de HTML para HTTPMateus Paixão2011-02-221-1/+1
| | |
| | * Merge branch 'master' of github.com:lifo/docrailsMani Tadayon2011-02-210-0/+0
| | |\
| | * | Fix typo in i18n guide: 'explicitely'Mani Tadayon2011-02-211-1/+1
| | | |
| | * | copy-edits 8d96b89Xavier Noria2011-02-2111-19/+36
| | | |
| | * | copy-edits 6d7a826Xavier Noria2011-02-211-3/+3
| | | |
| | * | copy-edits 34316d8Xavier Noria2011-02-211-7/+5
| | | |
| | * | Docs: Update to_xml documentation to match as_json docuemntationNicholas Rowe2011-02-211-0/+25
| | | |
| | * | Adding new examples for update_all methodRodrigo Navarro2011-02-211-0/+6
| | | |
| | * | Adding examplesRodrigo Navarro2011-02-211-0/+2
| | | |
| | * | Specifying :partial is required when passing additional options such as :layoutAndy Lindeman2011-02-211-1/+3
| | | |
| | * | cleans up PS1. Sorry lifo :)Vijay Dev2011-02-212-11/+11
| | | |
| | * | minor rephrasingVijay Dev2011-02-211-3/+1
| | | |
| | * | Documentation: Added small comments to Observering moduleNicholas Rowe2011-02-211-0/+3
| | | |
| | * | Tpyo: fixing several cases of the theNicholas Rowe2011-02-212-2/+2
| | | |
| | * | Typo: fixing the theNicholas Rowe2011-02-211-1/+1
| | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-16 10:05:22 +0000