aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
Commit message (Expand)AuthorAgeFilesLines
* Revert "Added callback details in "supported options" of has_many association"Pratik Naik2009-07-251-6/+0
* Merge commit 'mainstream/master'Pratik Naik2009-07-2511-263/+99
|\
| * Patch to ActiveModel's (and ActiveRecord, by association) XML serialization: ...John Maxwell2009-07-221-0/+15
| * AMo conversion helperJoshua Peek2009-07-211-7/+1
| * Add wrap_with_notifications helper to AMo observingJoshua Peek2009-07-201-1/+1
| * Merge branch 'master' of git@github.com:rails/railsYehuda Katz2009-07-194-10/+43
| |\
| | * Add primary_key option to belongs_to associationSzymon Nowak2009-07-154-9/+35
| | * Use map! instead of map for <association>_idsPratik Naik2009-07-131-2/+2
| | * Optimize <association>_ids for hm:t with belongs_to sourcePratik Naik2009-07-131-1/+8
| * | Define ActiveModel API ComplianceYehuda Katz2009-07-201-0/+7
| |/
| * Integrate AMo XML serializer into ARJoshua Peek2009-07-111-109/+4
| * Make it so AR attributes which conflict with object-private methods (e.g. sys...Sam Goldstein2009-07-091-4/+9
| * Add support for dumping non-standard primary keys when using the SQLite3 adap...Hongli Lai (Phusion)2009-07-071-1/+5
| * Integrate AMo JSON serializer into ARJoshua Peek2009-07-033-141/+24
* | Insert missing word in callbacks documentation.Mike Gunderloy2009-07-191-1/+1
* | More documentation about methods taking blocks.Ryan Bigg2009-07-161-0/+12
* | Document that after_create can take a block.Ryan Bigg2009-07-161-0/+4
* | Updated migration documentation to reflect default for UTC timestamped migrat...Mike Gunderloy2009-07-091-3/+3
* | Added callback details in "supported options" of has_many associationAbhishek Parokar2009-07-071-0/+6
* | Merge commit 'mainstream/master'Pratik Naik2009-07-0323-352/+315
|\|
| * Added AR:B#dup method for duplicationg object without frozen attributes [#285...Yehuda Katz + Carl Lerche2009-07-011-0/+7
| * Revert "Revert "Generate proper :counter_sql from :finder_sql when there is a...Pratik Naik2009-07-014-28/+16
| * Bump up the version to 3.0.preCarl Lerche2009-06-301-3/+3
| * Changed ActiveRecord::Base.human_name to underscore the class name before it ...Justin French2009-06-301-3/+3
| * Make sure the wrapped exceptions also have the original exception available.Michael Koziarski2009-06-264-7/+18
| * Translate foreign key violations to ActiveRecord::InvalidForeignKey exceptions.Michael Schuerig2009-06-263-0/+8
| * Translate adapter errors that indicate a violated uniqueness constraint to Ac...Michael Schuerig2009-06-265-1/+40
| * Revert "Generate proper :counter_sql from :finder_sql when there is a newline...Yehuda Katz + Carl Lerche2009-06-224-16/+28
| * Generate proper :counter_sql from :finder_sql when there is a newline charact...Patrick Joyce2009-06-214-28/+16
| * Fixed a bug where create_table could not be called without a block [#2221 sta...Joseph Wilk2009-06-211-1/+1
| * Ensure table names are quoted while renaming for sqlite3 adapter [#2272 state...Brian Hogan2009-06-211-1/+1
| * Ensure hm:t#create respects source associations hash conditions [#2090 state:...mattbauer2009-06-211-0/+7
| * Simplify AMo validation attribute readerJoshua Peek2009-06-171-4/+0
| * Updated require for AMo moveYehuda Katz + Carl Lerche2009-06-171-1/+1
| * Move model naming into ActiveModelJoshua Peek2009-06-171-0/+1
| * uses Object#metaclass and Object#class_eval in a few spotsXavier Noria2009-06-123-4/+7
| * HasOneThroughAssociation still shouldn't derive from HasManyThroughAssociation.Adam Milligan2009-06-124-167/+166
| * HasOneAssociation inherits AssociationProxy since it shares nothing with Belo...Emilio Tagua2009-06-121-5/+5
| * Move observing notify helper into AMoJoshua Peek2009-06-111-5/+0
| * Integrate ActiveModel::Observing into ActiveRecordJoshua Peek2009-06-103-93/+6
| * Whitelist the methods which are called by multiparameter attribute assignment.Michael Koziarski2009-06-101-8/+8
| * PostgreSQL adapter should call thread safe quote_string functionEugene Pimenov2009-06-091-2/+14
| * Fix AR json encodingJeremy Kemper2009-06-082-27/+10
| * Update for Active Model yielding per error not per attributeJeremy Kemper2009-06-081-0/+1
* | Added example of using shorthand in create_table.Ryan Bigg2009-06-221-0/+8
* | Add documentation for qualifying table names in conditions hashesJoel Chippindale2009-06-191-0/+6
* | Minor spelling/grammer changes in associationsLloyd Pick2009-06-081-4/+4
* | Merge commit 'mainstream/master'Pratik Naik2009-06-0123-974/+332
|\|
| * Schema dumper now records scale 0 decimal columns as decimal not integer.Giles Alexander2009-06-011-2/+9
| * AS::Concern redefines "include" to lazy include modules as dependenciesJoshua Peek2009-05-291-2/+2