aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Expand)AuthorAgeFilesLines
* Revert "fixed a doc bug in the CHANGELOG.md s/does no longer depend on/no lon...Vijay Dev2013-10-151-1/+1
* fixed a doc bug in the CHANGELOG.md s/does no longer depend on/no longer depe...Zachary Scott2013-09-281-1/+1
* Merge branch 'master' of github.com:rails/docrailsVijay Dev2013-09-281-1/+1
|\
| * `skiping` => `skipping`Vipul A M2013-09-171-1/+1
* | adding a test to demonstrate how to use STI subclasses on the far rightAaron Patterson2013-09-273-0/+10
* | changelog entryArthur Neves2013-09-251-0/+6
* | fix .find when inverse is setArthur Neves2013-09-252-5/+16
* | Merge pull request #12359 from arthurnn/inverse_on_callbacksRafael Mendonça França2013-09-254-2/+18
|\ \
| * | update changelog for #12359Arthur Neves2013-09-251-1/+5
| * | Make sure inverse_of is visible on the has_many callbacksArthur Neves2013-09-253-1/+13
* | | Merge branch 'master' into preloadAaron Patterson2013-09-2518-61/+195
|\| |
| * | Merge pull request #12290 from kennyj/fix_12278Andrew White2013-09-243-3/+28
| |\ \
| | * | ActiveRecord::ConnectionAdapters::Column.string_to_time method respects strin...kennyj2013-09-253-3/+28
| * | | Add regression test to #12343Rafael Mendonça França2013-09-241-0/+5
| * | | assign_attributes should return if argument is blank.wangjohn2013-09-241-0/+1
| |/ /
| * | Merge pull request #9860 from wangjohn/update_attributes_throws_error_with_nilRafael Mendonça França2013-09-244-6/+25
| |\ \
| | * | Raising an error when nil or non-hash is passed to update_attributes.wangjohn2013-06-254-6/+25
| * | | Deprecate unused quoted_locking_column method.kennyj2013-09-243-0/+9
| * | | Merge pull request #12315 from gaurish/superRafael Mendonça França2013-09-231-26/+28
| |\ \ \
| | * | | We shouldn't override PostgreSQLAdapter's superclass inheritance while monkey...Gaurish Sharma2013-09-231-26/+28
| * | | | Merge pull request #11987 from wangjohn/schema_dumper_optionsRafael Mendonça França2013-09-231-5/+16
| |\ \ \ \
| | * | | | Creating options for schema dumper.wangjohn2013-08-221-5/+16
| * | | | | Merge pull request #10816 from bogdan/less-dirty-dirtyRafael Mendonça França2013-09-233-13/+8
| * | | | | Merge pull request #11382 from kennyj/fix_10751-2Rafael Mendonça França2013-09-223-3/+13
| |\ \ \ \ \
| | * | | | | Migration dump UUID default functions to schema.rb. Fixes #10751.kennyj2013-07-103-3/+12
| | * | | | | Fix typo.kennyj2013-07-101-1/+1
| * | | | | | Give the credits [ci skip]Rafael Mendonça França2013-09-221-0/+2
| * | | | | | Merge pull request #10500 from kennyj/fix_10450Rafael Mendonça França2013-09-223-3/+50
| |\ \ \ \ \ \
| | * | | | | | Fixed a bug in when using has_many association with :inverse_of option and U...kennyj2013-05-083-3/+48
| * | | | | | | Merge pull request #12311 from kennyj/fix_typo_about_uuidRafael Mendonça França2013-09-211-1/+1
| |\ \ \ \ \ \ \
| | * | | | | | | Fix typo. This test isn't executed in even postgresql.kennyj2013-09-221-1/+1
| | | |_|_|/ / / | | |/| | | | |
| * / | | | | | Add back options argument in the ActiveRecord::Base.initialize methodRafael Mendonça França2013-09-211-2/+10
| |/ / / / / /
* | | | | | | remove initialize methodAaron Patterson2013-09-251-4/+0
* | | | | | | extract association resetting to a methodAaron Patterson2013-09-251-9/+16
* | | | | | | hash insertion order doesn't matter anymore, so only loop over theAaron Patterson2013-09-251-4/+2
* | | | | | | always populate the preloaded records instance variable so we can removeAaron Patterson2013-09-252-10/+5
* | | | | | | keep preloaded records in a list rather than extract from a hashAaron Patterson2013-09-253-16/+21
* | | | | | | push slice loading to it's own method so we can remove the type castingAaron Patterson2013-09-242-24/+20
* | | | | | | guarantee that `klass` is not nil inside the preloader objectsAaron Patterson2013-09-242-5/+12
* | | | | | | eliminate unused ivarAaron Patterson2013-09-241-1/+0
* | | | | | | all records have a preloaded, so eliminate that conditionalAaron Patterson2013-09-241-11/+7
* | | | | | | eliminate the `loaded?` conditionalAaron Patterson2013-09-243-12/+7
* | | | | | | push preloaded test up to the factory method so we can eliminateAaron Patterson2013-09-244-9/+21
* | | | | | | we can't sort by lhs since the middle records have difference classesAaron Patterson2013-09-232-20/+21
* | | | | | | adding a test for sti on middle tables with sorting on RHSAaron Patterson2013-09-232-1/+19
* | | | | | | pass the preloader down so we only have to construct oneAaron Patterson2013-09-237-21/+21
* | | | | | | reuse the same preloader object for each associationAaron Patterson2013-09-231-2/+2
* | | | | | | remove state from the preloaderAaron Patterson2013-09-233-28/+18
* | | | | | | pass the scope all the way down to the constructorsAaron Patterson2013-09-231-10/+10
* | | | | | | only do the should_reset test onceAaron Patterson2013-09-231-6/+6