aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* stop reversing tables until we absolutely mustAaron Patterson2013-10-152-3/+3
* pass the chain the join_constraintsAaron Patterson2013-10-152-3/+4
* Merge branch 'master' into joindepAaron Patterson2013-10-156-5/+12
|\
| * use the cached arel tableAaron Patterson2013-10-152-2/+2
| * Fix typo in the changelog entryRafael Mendonça França2013-10-151-1/+1
| * Don't remove the select values to add they back againRafael Mendonça França2013-10-151-1/+1
| * Merge pull request #12547 from derekprior/dp-fix-null-relation-pluckRafael Mendonça França2013-10-153-2/+9
| |\
| | * Pluck on NullRelation accepts a list of columnsDerek Prior2013-10-153-2/+9
* | | Merge branch 'master' into joindepAaron Patterson2013-10-1556-203/+365
|\| |
| * | grammar fix (reverted in e9a1ecd)Vijay Dev2013-10-151-1/+1
| * | Merge branch 'master' of github.com:rails/docrailsVijay Dev2013-10-151-1/+1
| |\ \ | | |/ | |/|
| | * Revert "fixed a doc bug in the CHANGELOG.md s/does no longer depend on/no lon...Vijay Dev2013-10-151-1/+1
| | * Use ActiveRecord::Base#update! instead of #update_attributes!Zachary Scott2013-09-281-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 pull request #12524 from kirs/patch-1Rafael Mendonça França2013-10-151-1/+1
| |\ \
| | * | Prepare generated Gemfile for Capistrano 3Kir Shatrov2013-10-151-1/+1
| * | | Merge pull request #12543 from route/missed_requireRafael Mendonça França2013-10-151-0/+1
| |\ \ \
| | * | | Add missed require making `enable_warnings` availableDmitry Vorotilin2013-10-151-0/+1
| |/ / /
| * | | Merge pull request #11432 from yalab/generate_model_name_optionYves Senn2013-10-155-6/+53
| |\ \ \
| | * | | Added --model-name option scaffold_controller_generator.yalab2013-10-155-6/+53
| |/ / /
| * | | Merge pull request #12534 from vipulnsward/minor_number_helper_perfsRafael Mendonça França2013-10-141-4/+2
| |\ \ \
| | * | | Minor Refactoring to `NumberHelper#number_to_human`Vipul A M2013-10-141-4/+2
| * | | | read the association instead of sendingAaron Patterson2013-10-141-1/+3
| * | | | we should have unique sponsorable ids in the fixtures at leastAaron Patterson2013-10-141-1/+1
| * | | | Merge pull request #12536 from sbagdat/patch-1Rafael Mendonça França2013-10-141-2/+0
| |\ \ \ \
| | * | | | Remove size alias for length validationSıtkı Bağdat2013-10-141-2/+0
| | |/ / /
| * | | | simplify populating the ordering hashAaron Patterson2013-10-141-10/+5
| * | | | the preloader for the RHS has all the preloaded records, so ask itAaron Patterson2013-10-141-3/+3
| * | | | only calculate offset index once. #12537Aaron Patterson2013-10-141-6/+10
| * | | | Merge pull request #10538 from neerajdotname/3882Rafael Mendonça França2013-10-149-1/+65
| |\ \ \ \
| | * | | | scope_chain should not be mutated for other reflectionsNeeraj Singh2013-10-149-1/+65
| * | | | | Merge pull request #12532 from vipulnsward/singleton_classRafael Mendonça França2013-10-141-2/+5
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Fix `singleton_class?`Vipul A M2013-10-151-2/+5
| |/ / / /
| * | | | Merge pull request #12530 from vipulnsward/remove_thread_safeRafael Mendonça França2013-10-141-13/+0
| |\ \ \ \
| | * | | | `$SAFE = 4;` has been removed with Ruby 2.1Vipul A M2013-10-141-13/+0
| |/ / / /
| * | | | Merge pull request #12527 from vipulnsward/sqlite_database_typesRafael Mendonça França2013-10-141-18/+16
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Remove `default_primary_key_type` and extract contains of `native_database_t...Vipul A M2013-10-141-18/+16
| * | | | Merge pull request #9499 from dmitry/inverse_instance_should_not_be_reloaded_...Rafael Mendonça França2013-10-143-2/+24
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Add a note to the changelog for #9499Dmitry Polushkin2013-10-131-0/+6
| | * | | add inversed accessor to association classDmitry Polushkin2013-10-131-2/+3
| | * | | inversed instance should not be reloaded after stale state was changedDmitry Polushkin2013-10-132-2/+17
| * | | | Merge pull request #11833 from vipulnsward/remove_autoincrementRafael Mendonça França2013-10-142-15/+3
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Remove sqlite specific`supports_autoincrement?` which always defaults to trueVipul A M2013-08-102-15/+3
| * | | | cleanup changelog entry format. [ci skip]Yves Senn2013-10-141-2/+4
| * | | | Extract a function to determine if the default value is a functionRafael Mendonça França2013-10-141-1/+5
| * | | | Push default_function to superclass to avoid method checkRafael Mendonça França2013-10-143-15/+18
| * | | | Dump the default function when the primary key is uuidRafael Mendonça França2013-10-142-2/+3
| * | | | Merge pull request #12486 from cjolly/newline-eof-structure-sqlRafael Mendonça França2013-10-131-0/+1
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | newline at end of structure.sql fileChad Jolly2013-10-131-0/+1
| * | | | Merge pull request #12518 from vipulnsward/remove_count_optionsRafael Mendonça França2013-10-135-20/+17
| |\ \ \ \