Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | prefer composition over inheritance with AD::MS | Aaron Patterson | 2011-03-01 | 3 | -9/+42 | |
| | | | ||||||
| * | | fixing test case test on 1.9.3dev | Aaron Patterson | 2011-03-01 | 1 | -0/+4 | |
| | | | ||||||
| * | | Remove warnings about redefined test methods | Sam Elliott | 2011-03-01 | 1 | -4/+4 | |
| | | | | | | | | | | | | | | | | | | [#6490 state:committed] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | |||||
| * | | Revert "compute ext in initialize, and use an attr_reader" | Aaron Patterson | 2011-02-28 | 1 | -5/+7 | |
| | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 2dbb73bdda3b81947fd112486ac4285fb1a6e3a9. Conflicts: actionpack/lib/action_dispatch/middleware/static.rb | |||||
| * | | no need to pass a regex to Regexp.compile | Aaron Patterson | 2011-02-28 | 1 | -4/+4 | |
| | | | ||||||
| * | | compute ext in initialize, and use an attr_reader | Aaron Patterson | 2011-02-28 | 1 | -7/+5 | |
| | | | ||||||
| * | | Merge branch 'fuuu' | Aaron Patterson | 2011-02-28 | 31 | -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 output | Aaron Patterson | 2011-02-28 | 1 | -4/+11 | |
| | | | | ||||||
| * | | | reduce two method calls per request, 1 to method_missing and one to send | Aaron Patterson | 2011-02-28 | 1 | -0/+4 | |
| | | | | ||||||
* | | | | Merge branch 'master' into nested_has_many_through | Jon Leighton | 2011-03-04 | 584 | -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 Leighton | 2011-02-28 | 11 | -626/+618 | |
| | | | | | | | | | | | | | | | | ActiveRecord::Associations::ClassMethods to just ActiveRecord::Associations | |||||
| * | | | Rewrote AssociationPreload. | Jon Leighton | 2011-02-28 | 21 | -458/+583 | |
| |/ / | ||||||
| * | | Updated the AS guides with some information on the difference between ↵ | Josh Kalderimis | 2011-02-28 | 1 | -1/+9 | |
| | | | | | | | | | | | | Date.today and Date.current. | |||||
| * | | updated Time, Date and DateTime current methods in AS to use Time.zone and ↵ | Josh Kalderimis | 2011-02-28 | 10 | -47/+49 | |
| | | | | | | | | | | | | | | | | | | not Time.zone_default. [#6410 state:committed] | |||||
| * | | revises a few details in public/index.html | Xavier Noria | 2011-02-28 | 1 | -7/+9 | |
| | | | ||||||
| * | | Remove redundant to_sym call. | Ben Orenstein | 2011-02-28 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | [#6483 state:committed] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | |||||
| * | | skip this on oracle | Aaron Patterson | 2011-02-28 | 1 | -0/+2 | |
| | | | ||||||
| * | | Make ActiveSupport::Configurable work with modules | Oriol Gual and Josep M. Bach | 2011-02-28 | 2 | -2/+8 | |
| | | | | | | | | | | | | | | | | | | [#6486 state:committed] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | |||||
| * | | added activesupport/test/tmp to gitignore | Diego Carrion | 2011-02-28 | 1 | -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 Pastorino | 2011-02-28 | 3 | -4/+12 | |
| | | | | | | | | | | | | nil value | |||||
| * | | Add tests for register expansion methods with key = [] | Santiago Pastorino | 2011-02-28 | 1 | -2/+12 | |
| | | | ||||||
| * | | Revert "Properly interpolate i18n keys in modules [#5572 state:resolved]" | Santiago Pastorino | 2011-02-27 | 5 | -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 models | Santiago Pastorino | 2011-02-27 | 2 | -0/+11 | |
| | | | ||||||
| * | | Make sure the Thor generator LoadError does not output --dev twice [#6431 ↵ | Jeff Kreeftmeijer | 2011-02-27 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | state:resolved] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | |||||
| * | | use an attribute rather than a SQL literal | Aaron Patterson | 2011-02-26 | 2 | -1/+2 | |
| | | | ||||||
| * | | removing limits and offsets from COUNT queries unless both are specified. ↵ | Aaron Patterson | 2011-02-25 | 4 | -1/+51 | |
| | | | | | | | | | | | | [#6268 state:resolved] | |||||
| * | | only take the limit if there is a limit to take | Aaron Patterson | 2011-02-25 | 1 | -1/+1 | |
| |/ | ||||||
| * | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-02-25 | 13 | -86/+83 | |
| |\ | ||||||
| | * | standardize all shell commands with the $ prefix | Vijay Dev | 2011-02-25 | 12 | -78/+78 | |
| | | | ||||||
| | * | Fix missing inheritance from AR::Base in docs | Josep M. Bach | 2011-02-24 | 1 | -1/+1 | |
| | | | ||||||
| | * | Fixing wrong class name. | Rodrigo Navarro | 2011-02-23 | 1 | -1/+1 | |
| | | | ||||||
| | * | ActiveModel::Validator#validate must receive have a record parameter. | Rodrigo Navarro | 2011-02-23 | 1 | -6/+3 | |
| | | | ||||||
| * | | Always use ActionDispatch::ShowExceptions middleware [#6462 state:resolved] | Prem Sichanugrist | 2011-02-25 | 3 | -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 Sichanugrist | 2011-02-25 | 2 | -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 subclasses | Eric Allam | 2011-02-24 | 2 | -2/+7 | |
| | | | ||||||
| * | | observers leak across tests, so rather than modify the object, we should ↵ | Aaron Patterson | 2011-02-23 | 1 | -6/+12 | |
| | | | | | | | | | | | | just count the number of times the observer was called | |||||
| * | | Removing redundant File.expand_path from generators test | Vinicius Baggio | 2011-02-23 | 1 | -1/+1 | |
| | | | | | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
| * | | Fix observer callbacks firing multiple times on descendant instances | Kamal Fariz Mahyuddin | 2011-02-22 | 2 | -1/+22 | |
| | | | ||||||
| * | | Fix tests on 1.8. | José Valim | 2011-02-22 | 2 | -27/+8 | |
| | | | ||||||
| * | | We're in 2011, let's update our license | Prem Sichanugrist | 2011-02-22 | 13 | -13/+13 | |
| | | | | | | | | | | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | |||||
| * | | Prepend the CSRF filter to make it much more difficult to execute ↵ | Michael Koziarski | 2011-02-23 | 1 | -1/+1 | |
| | | | | | | | | | | | | application code before it fires. | |||||
| * | | expectations change when using IM. Change oracle tests to reflect that | Aaron Patterson | 2011-02-22 | 1 | -2/+6 | |
| | | | ||||||
| * | | Relation will delegate to AR::Base which already uses the Dynamic finders, ↵ | Aaron Patterson | 2011-02-22 | 1 | -8/+3 | |
| |/ | | | | | | | so eliminate duplicate calls | |||||
| * | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-02-22 | 2 | -2/+2 | |
| |\ | ||||||
| | * | alteracao de HTML para HTTP | Mateus Paixão | 2011-02-22 | 1 | -1/+1 | |
| | | | ||||||
| | * | Merge branch 'master' of github.com:lifo/docrails | Mani Tadayon | 2011-02-21 | 0 | -0/+0 | |
| | |\ | ||||||
| | * | | Fix typo in i18n guide: 'explicitely' | Mani Tadayon | 2011-02-21 | 1 | -1/+1 | |
| | | | | ||||||
| | * | | copy-edits 8d96b89 | Xavier Noria | 2011-02-21 | 11 | -19/+36 | |
| | | | | ||||||
| | * | | copy-edits 6d7a826 | Xavier Noria | 2011-02-21 | 1 | -3/+3 | |
| | | | | ||||||
| | * | | copy-edits 34316d8 | Xavier Noria | 2011-02-21 | 1 | -7/+5 | |
| | | | |