aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
Commit message (Expand)AuthorAgeFilesLines
* Reword the docs for association_foreign_keyPratik Naik2009-02-011-5/+4
* Merge commit 'mainstream/master'Pratik Naik2009-02-018-48/+557
|\
| * validate_length_of should use custom message if given when using in or within.miloops2009-02-011-5/+4
| * Add support for nested object forms to ActiveRecord and the helpers in Action...Eloy Duran2009-02-017-43/+553
* | Merge commit 'mainstream/master'Pratik Naik2009-01-294-9/+31
|\|
| * Sqlite adapter's copy_table incorrectly attempts to recreate a primary key id...Jacob Dunphy2009-01-291-1/+1
| * Ensure whitespaces are stripped when merging string joins. [#1297 state:resol...Filip H.F. "FiXato" Slagter2009-01-281-1/+1
| * Add array id support to Model.update_counters. [#1254 state:resolved] [Carlos...Pratik Naik2009-01-281-2/+17
| * Mysql#reconnect is set according to the 'reconnect' key in the connection spec.Dov Murik2009-01-271-2/+5
| * Make sure inner scope conditions get a preference over the outer onesPratik Naik2009-01-241-2/+6
| * Minor refactoring of validates_associated to replace #inject with #collect + ...Josh Susser2009-01-221-1/+1
| * Merge docrailsPratik Naik2009-01-185-59/+93
* | Clarified the difference between `:foreign_key` and `:association_foreign_key...Karel Minarik2009-01-231-5/+7
* | Merge commit 'mainstream/master'Pratik Naik2009-01-186-10/+25
|\|
| * Bump up the year in MIT license filesPratik Naik2009-01-181-1/+1
| * Cache columns for has_and_belongs_to_many associationslukeludwig2009-01-172-3/+17
| * Make belongs_to :dependent => :destroy destroy self before associated object...Ben VandenBos2009-01-161-2/+2
| * Fixed broken after_save callback; was being called when before_create was can...Michael Lovitt2009-01-161-2/+3
| * Fixing bug on ActiveRecord::Dirty#field_changed? for nullable numeric columns...Carlos Kozuszko2009-01-161-2/+2
* | revised rdoc of class_of_active_record_descendantXavier Noria2009-01-151-1/+2
* | Merge commit 'mainstream/master'Pratik Naik2009-01-147-59/+216
|\|
| * Fix PostgreSQL unit test failures that only occur when using the old 'postgre...Hongli Lai (Phusion)2009-01-132-10/+12
| * Remove legacy reloadable? method from ActiveRecord::SessionStore [#1745 state...Cody Fauser2009-01-131-5/+0
| * Introduce transaction_joinable flag to mark that the fixtures transaction can...Jeremy Kemper2009-01-104-43/+39
| * Merge branch 'master' into savepointsJeremy Kemper2009-01-1022-163/+667
| |\
| * \ Merge commit 'origin/master' into savepointsHongli Lai (Phusion)2008-12-098-32/+74
| |\ \
| * \ \ Merge commit 'origin/master' into savepointsHongli Lai (Phusion)2008-12-0315-246/+290
| |\ \ \
| * | | | Reimplement Jeremy's PostgreSQL automatic transaction state introspection code.Hongli Lai (Phusion)2008-11-032-2/+28
| * | | | Rename ActiveRecord::Base#transaction's :force option to :nest. Improve docum...Hongli Lai (Phusion)2008-11-031-2/+57
| * | | | Make SQLite3 pass the unit tests for savepoints.Hongli Lai (Phusion)2008-11-033-0/+14
| * | | | Fix a stale typo in the PostgreSQL adapter. Fix a stale mock expection in tra...Hongli Lai (Phusion)2008-11-031-1/+1
| * | | | Revert "PostgreSQL: introduce transaction_active? rather than tracking activi...Hongli Lai (Phusion)2008-11-031-38/+0
| * | | | Improve documentation for DatabaseStatements#transactions and AbstractAdapter...Hongli Lai (Phusion)2008-11-033-6/+74
| * | | | Implement savepoints.Jonathan Viney2008-11-036-14/+53
* | | | | Docs: in typical usage, "descendant" is the noun and "descendent" is the adje...Chris Kampmeier2009-01-113-5/+5
* | | | | A little copyediting of 73db43527d162fdf95665d88589f7ab6d17a17faChris Kampmeier2009-01-111-4/+5
* | | | | Add better docs for ActiveRecord::Base#attribute_for_inspectChris Kampmeier2009-01-111-1/+12
* | | | | Minor changes to AR#delete/destroy docsPratik Naik2009-01-101-2/+2
* | | | | Merge commit 'mainstream/master'Pratik Naik2009-01-107-9/+62
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merge commit 'fred/pullable'Pratik Naik2008-12-303-5/+8
| |\ \ \ \
| | * | | | Fix to_sentence being used with options removed by 273c77Frederick Cheung2008-12-271-1/+1
| | * | | | Fix HasManyAssociation#create ignoring the :primary_key option [#1633 state:r...Roman Shterenzon2008-12-271-1/+4
| | * | | | Fix :include of has_one with :primary_key optionFrederick Cheung2008-12-261-1/+1
| | * | | | Fix :include of has_many associations with :primary_key optionFrederick Cheung2008-12-262-2/+2
| * | | | | Add transaction check to SQLite2 adapter to fix test_sqlite_add_column_in_tra...Mike Gunderloy2008-12-301-0/+4
| * | | | | Merge branch 'master' of git@github.com:rails/railsDavid Heinemeier Hansson2008-12-287-68/+116
| |\ \ \ \ \
| * | | | | | Introduce dynamic scopes for ActiveRecord: you can now use class methods like...Yaroslav Markin2008-12-283-1/+50
* | | | | | | Rewrite ActiveRecord::Base#destroy_all docs to remove incorrect info, mention...Chris Kampmeier2009-01-061-13/+20
* | | | | | | document edge cases in AR calculations, and wrap some commentsXavier Noria2008-12-301-8/+16
* | | | | | | Rewrite ActiveRecord::Base#delete docs to remove false information about call...Chris Kampmeier2008-12-291-7/+9