Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Removed old commented code | Emilio Tagua | 2009-06-23 | 1 | -21/+0 |
| | |||||
* | Forget about auto scope, it's always explicit. | Emilio Tagua | 2009-06-17 | 1 | -7/+6 |
| | |||||
* | Merge commit 'rails/master' | Emilio Tagua | 2009-06-16 | 3 | -4/+7 |
|\ | |||||
| * | uses Object#metaclass and Object#class_eval in a few spots | Xavier Noria | 2009-06-12 | 3 | -4/+7 |
| | | | | | | | | | | | | [#2797 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | | Leave the quoting part to ARel | Emilio Tagua | 2009-06-12 | 5 | -172/+171 |
|\| | |||||
| * | HasOneThroughAssociation still shouldn't derive from HasManyThroughAssociation. | Adam Milligan | 2009-06-12 | 4 | -167/+166 |
| | | | | | | | | | | | | [#1642 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | HasOneAssociation inherits AssociationProxy since it shares nothing with ↵ | Emilio Tagua | 2009-06-12 | 1 | -5/+5 |
| | | | | | | | | | | | | | | | | BelongsToAssociation. [#2796 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | | Merge commit 'rails/master' | Emilio Tagua | 2009-06-12 | 4 | -98/+6 |
|\| | |||||
| * | Move observing notify helper into AMo | Joshua Peek | 2009-06-11 | 1 | -5/+0 |
| | | |||||
| * | Integrate ActiveModel::Observing into ActiveRecord | Joshua Peek | 2009-06-10 | 3 | -93/+6 |
| | | |||||
* | | Merge commit 'rails/master' | Emilio Tagua | 2009-06-10 | 1 | -8/+8 |
|\| | |||||
| * | Whitelist the methods which are called by multiparameter attribute assignment. | Michael Koziarski | 2009-06-10 | 1 | -8/+8 |
| | | | | | | | | This prevents users from causing NoMethodErrors and the like by editing the parameter names, and closes a potential exploit of CVE-2009-1904. | ||||
* | | Merge branch 'update_all' | Emilio Tagua | 2009-06-10 | 1 | -10/+28 |
|\ \ | |||||
| * | | Initial update_all migration | Emilio Tagua | 2009-06-10 | 1 | -10/+28 |
| | | | |||||
* | | | Use array of orders instead of string concatenation | Emilio Tagua | 2009-06-10 | 1 | -7/+5 |
|/ / | |||||
* | | Revert "Use ARel in SQL generation through associations" | Emilio Tagua | 2009-06-10 | 1 | -28/+10 |
| | | | | | | | | This reverts commit 7be3e3ba0547587313d87bccb788a8466a62628a. | ||||
* | | Use ARel in SQL generation through associations | Emilio Tagua | 2009-06-10 | 1 | -10/+28 |
| | | |||||
* | | Use ARel in SQL generation through associations | Emilio Tagua | 2009-06-10 | 2 | -15/+19 |
| | | |||||
* | | Merge commit 'rails/master' | Emilio Tagua | 2009-06-09 | 4 | -29/+25 |
|\| | |||||
| * | PostgreSQL adapter should call thread safe quote_string function | Eugene Pimenov | 2009-06-09 | 1 | -2/+14 |
| | | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> | ||||
| * | Fix AR json encoding | Jeremy Kemper | 2009-06-08 | 2 | -27/+10 |
| | | |||||
| * | Update for Active Model yielding per error not per attribute | Jeremy Kemper | 2009-06-08 | 1 | -0/+1 |
| | | |||||
* | | Merge commit 'rails/master' | Emilio Tagua | 2009-06-02 | 23 | -975/+334 |
|\| | | | | | | | | | | | Conflicts: activerecord/lib/active_record.rb | ||||
| * | Schema dumper now records scale 0 decimal columns as decimal not integer. | Giles Alexander | 2009-06-01 | 1 | -2/+9 |
| | | | | | | | | | | | | | | | | | | | | The schema dumper would dump out any decimal or numeric column that had a zero scale as an integer column. This will cause problems for very large precision columns on some DBMSs, particularly PostgreSQL. It also looks strange to see your column change type after moving through schema.rb. Signed-off-by: Michael Koziarski <michael@koziarski.com> [#2741 state:committed] | ||||
| * | AS::Concern redefines "include" to lazy include modules as dependencies | Joshua Peek | 2009-05-29 | 1 | -2/+2 |
| | | |||||
| * | AS::Concern includes InstanceMethods module if it exists | Joshua Peek | 2009-05-29 | 1 | -2/+0 |
| | | |||||
| * | Merge branch 'master' into active_model | Joshua Peek | 2009-05-29 | 43 | -249/+387 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: activemodel/lib/active_model/core.rb activemodel/test/cases/state_machine/event_test.rb activemodel/test/cases/state_machine/state_transition_test.rb activerecord/lib/active_record/validations.rb activerecord/test/cases/validations/i18n_validation_test.rb activeresource/lib/active_resource.rb activeresource/test/abstract_unit.rb | ||||
| | * | Break up DependencyModule's dual function of providing a "depend_on" DSL and ↵ | Joshua Peek | 2009-05-28 | 19 | -19/+19 |
| | | | | | | | | | | | | "included" block DSL into separate modules. But, unify both approaches under AS::Concern. | ||||
| * | | Merge branch 'master' into active_model | Pratik Naik | 2009-04-22 | 8 | -70/+169 |
| |\ \ | | | | | | | | | | | | | | | | | Conflicts: activeresource/lib/active_resource/validations.rb | ||||
| * | | | Deprecate Model#validate/validate_on_create/validate_on_update. Use ↵ | Pratik Naik | 2009-03-21 | 1 | -13/+14 |
| | | | | | | | | | | | | | | | | Model.validate :method and likewise | ||||
| * | | | Move validate_on_create and validate_on_update from ActiveModel to ActiveRecord | Pratik Naik | 2009-03-21 | 2 | -4/+13 |
| | | | | |||||
| * | | | Add I18n translations to ActiveModel and move more AR specific parts to ↵ | Pratik Naik | 2009-03-20 | 1 | -0/+115 |
| | | | | | | | | | | | | | | | | ActiveRecord::Validations | ||||
| * | | | Include ActiveModel::Validations from ActiveRecord::Validations | Pratik Naik | 2009-03-20 | 2 | -21/+30 |
| | | | | |||||
| * | | | 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 | 4 | -1003/+13 |
| | | | | |||||
* | | | | 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 | 1 | -1/+1 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | Remove 'core' fluff. Hookable ActiveSupport.load_all! | Jeremy Kemper | 2009-05-20 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge commit 'rails/master' | Emilio Tagua | 2009-05-18 | 5 | -10/+18 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 2 | -1/+8 |
| |\| | | | |||||
| | * | | | Ensure HasManyThroughAssociation#destroy delete orphan records [#2251 ↵ | Luca Guidi | 2009-05-18 | 1 | -0/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | state:resolved] [James Le Cuirot] | ||||
| * | | | | Reimplement Fixtures.identify so that it consistently generates identities ↵ | Ken Collins | 2009-05-18 | 1 | -4/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. |