Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | * | Break up DependencyModule's dual function of providing a "depend_on" DSL and ↵ | Joshua Peek | 2009-05-28 | 21 | -21/+21 | |
| | | | | | | | | | | | | "included" block DSL into separate modules. But, unify both approaches under AS::Concern. | |||||
| * | | Merge branch 'master' into active_model | Pratik Naik | 2009-04-22 | 21 | -86/+373 | |
| |\ \ | | | | | | | | | | | | | | | | | Conflicts: activeresource/lib/active_resource/validations.rb | |||||
| * | | | Deprecate Model#validate/validate_on_create/validate_on_update. Use ↵ | Pratik Naik | 2009-03-21 | 5 | -22/+67 | |
| | | | | | | | | | | | | | | | | Model.validate :method and likewise | |||||
| * | | | Deprecate Errors#on_base/add_to_base/invalid?/each_full | Pratik Naik | 2009-03-21 | 1 | -2/+2 | |
| | | | | ||||||
| * | | | Move validate_on_create and validate_on_update from ActiveModel to ActiveRecord | Pratik Naik | 2009-03-21 | 2 | -4/+13 | |
| | | | | ||||||
| * | | | Add ActiveModel::Validations tests for regular ruby classes | Pratik Naik | 2009-03-20 | 1 | -0/+9 | |
| | | | | ||||||
| * | | | Add I18n translations to ActiveModel and move more AR specific parts to ↵ | Pratik Naik | 2009-03-20 | 4 | -0/+869 | |
| | | | | | | | | | | | | | | | | ActiveRecord::Validations | |||||
| * | | | Include ActiveModel::Validations from ActiveRecord::Validations | Pratik Naik | 2009-03-20 | 2 | -21/+30 | |
| | | | | ||||||
| * | | | Deprecate Error#on(attribute) in favour of Errors#[attribute] | Pratik Naik | 2009-03-20 | 5 | -25/+25 | |
| | | | | ||||||
| * | | | Move relevant validation tests from Active Record to Active Model | Pratik Naik | 2009-03-20 | 6 | -2384/+506 | |
| | | | | ||||||
| * | | | Make Active Model test suite similar to Active Record | Pratik Naik | 2009-03-20 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | Make Active Resource use ActiveModel::Errors | Pratik Naik | 2009-03-19 | 1 | -3/+1 | |
| | | | | ||||||
| * | | | Move uniqueness and association validations to Active Record | Pratik Naik | 2009-03-19 | 3 | -0/+211 | |
| | | | | ||||||
| * | | | Move all the Active Record validations to Active Model | Pratik Naik | 2009-03-19 | 8 | -1139/+147 | |
| | | | | ||||||
* | | | | Set ActiveRecord as Arel engine on load. | Emilio Tagua | 2009-06-02 | 2 | -2/+3 | |
| | | | | ||||||
* | | | | No need to specify the engine now that it is in active_record.rb | Emilio Tagua | 2009-06-02 | 1 | -2/+2 | |
| | | | | ||||||
* | | | | Refactors to work with latest Arel implementation. | Emilio Tagua | 2009-06-02 | 7 | -20/+26 | |
| | | | | ||||||
* | | | | Merge commit 'rails/master' | Emilio Tagua | 2009-05-26 | 2 | -2/+2 | |
|\ \ \ \ | | |_|/ | |/| | | ||||||
| * | | | Fix eager association test related to different ordering on sqlite | Chad Woolley | 2009-05-21 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | [#2686 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | |||||
| * | | | Remove 'core' fluff. Hookable ActiveSupport.load_all! | Jeremy Kemper | 2009-05-20 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | Merge commit 'rails/master' | Emilio Tagua | 2009-05-19 | 3 | -2/+9 | |
|\| | | | ||||||
| * | | | Add missing models and fixtures [#2673 state:resolved] | Emilio Tagua | 2009-05-19 | 3 | -25/+32 | |
| | | | | | | | | | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | |||||
* | | | | Merge commit 'rails/master' | Emilio Tagua | 2009-05-18 | 9 | -12/+51 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record.rb Updated: Arel submodule | |||||
| * | | | Merge branch 'master' of git@github.com:rails/rails | Jeremy Kemper | 2009-05-18 | 1 | -2/+2 | |
| |\ \ \ | ||||||
| | * | | | Remove unnecessary condition and local variable [#2602 state:resolved] | Emilio Tagua | 2009-05-18 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | |||||
| * | | | | Merge branch 'master' of git@github.com:rails/rails | Jeremy Kemper | 2009-05-18 | 5 | -3/+36 | |
| |\| | | | ||||||
| | * | | | Ensure HasManyThroughAssociation#destroy delete orphan records [#2251 ↵ | Luca Guidi | 2009-05-18 | 2 | -2/+15 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | |||||
| | * | | | Make sure default_scope#create checks for options[:conditions] [#2181 ↵ | Pratik Naik | 2009-05-18 | 3 | -1/+21 | |
| | | | | | | | | | | | | | | | | | | | | state:resolved] [James Le Cuirot] | |||||
| * | | | | Reimplement Fixtures.identify so that it consistently generates identities ↵ | Ken Collins | 2009-05-18 | 2 | -4/+10 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | across ruby versions. [#2633 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | |||||
| * | | | | Missing 1.8.7 backport extensions | Jeremy Kemper | 2009-05-18 | 2 | -0/+3 | |
| | | | | | ||||||
| * | | | | Revert "Get AR CI passing again by requiring the entire core_ext" | Jeremy Kemper | 2009-05-18 | 1 | -3/+0 | |
| |/ / / | | | | | | | | | | | | | This reverts commit 8e6a18d8672f7efe6ef79b49185e4a6a23e4e547. | |||||
* | | | | Merge branch 'master' of git://github.com/rails/rails | Emilio Tagua | 2009-05-18 | 1 | -2/+2 | |
|\| | | | ||||||
| * | | | Add missing model and fixtures to finder_test [#2671 state:resolved] | Emilio Tagua | 2009-05-18 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | |||||
* | | | | Merge commit 'rails/master' | Emilio Tagua | 2009-05-18 | 45 | -144/+281 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/base.rb activerecord/lib/active_record/migration.rb activerecord/test/cases/helper.rb | |||||
| * | | | Fixed limited eager loading associations with numbers in the name [#2668 ↵ | Benjamin Floering | 2009-05-18 | 5 | -2/+11 | |
| | | | | | | | | | | | | | | | | | | | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | |||||
| * | | | Fix reset_session with ActiveRecord store [#2200 state:resolved] | Joshua Peek | 2009-05-17 | 1 | -1/+9 | |
| | | | | ||||||
| * | | | replace the aaa_create_tables_test hack with loading test database schema in ↵ | Mislav Marohnić | 2009-05-17 | 4 | -31/+22 | |
| | | | | | | | | | | | | | | | | | | | | | | | | the test helper [#2663 state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com> | |||||
| * | | | Implement #many? for NamedScope and AssociationCollection using #size [#1500 ↵ | Chris Kampmeier | 2009-05-17 | 5 | -1/+94 | |
| | | | | | | | | | | | | | | | | | | | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | |||||
| * | | | has_one :through should not create a new association when assigned nil [#698 ↵ | Daniel Guettler | 2009-05-17 | 2 | -9/+16 | |
| | | | | | | | | | | | | | | | | | | | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | |||||
| * | | | Get AR CI passing again by requiring the entire core_ext | Yehuda Katz | 2009-05-16 | 1 | -0/+3 | |
| | | | | | | | | | | | | | | | | | | | | Note that this includes Time and Date; we should really figure out what parts of core_ext are really required for AR and require just those. | |||||
| * | | | Merge commit 'origin/master' | Yehuda Katz + Carl Lerche | 2009-05-14 | 3 | -12/+13 | |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: actionpack/lib/action_controller/abstract/base.rb actionpack/lib/action_controller/routing.rb | |||||
| | * | | | Changed ActiveRecord::Base#exists? to invoke find_initial so that it is ↵ | Peter Marklund | 2009-05-14 | 2 | -8/+9 | |
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | compatible with, and doesn't lose, :include scopes (references to eager loaded tables) Signed-off-by: Michael Koziarski <michael@koziarski.com> [#2543 state:committed] | |||||
| * | | | Simple examples for require profiling | Jeremy Kemper | 2009-05-13 | 1 | -0/+14 | |
| | | | | ||||||
| * | | | Cherry-pick core extensions | Jeremy Kemper | 2009-05-13 | 30 | -33/+82 | |
| | | | | ||||||
| * | | | isolated_test task | Jeremy Kemper | 2009-05-13 | 1 | -6/+14 | |
| | | | | ||||||
| * | | | Remove support for deprecated validation message interpolation format | Jeremy Kemper | 2009-05-13 | 3 | -53/+8 | |
| | | | | ||||||
* | | | | Merge commit 'rails/master' | Emilio Tagua | 2009-05-12 | 31 | -155/+246 | |
|\| | | | ||||||
| * | | | Use DependencyModule for included hooks in ActiveRecord | Bryan Helmkamp | 2009-05-11 | 21 | -125/+111 | |
| | | | | ||||||
| * | | | Revert "Fixed bug with polymorphic has_one :as pointing to an STI record" | Jeremy Kemper | 2009-05-11 | 6 | -21/+5 | |
| | | | | | | | | | | | | | | | | | | | | | | | | [#2594 state:open] This reverts commit 99c103be1165da9c8299bc0977188ecf167e06a5. | |||||
| * | | | Allow you to pass :all_blank to :reject_if option to automatically create a ↵ | Mike Breen | 2009-05-10 | 4 | -2/+30 | |
| | | | | | | | | | | | | | | | | Proc that will reject any record with blank attributes. |