aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* adding set_bindsAaron Patterson2013-05-211-0/+8
* Merge branch 'master' into experimentAaron Patterson2013-05-2136-70/+233
|\
| * Merge branch 'bindwhere'Aaron Patterson2013-05-212-20/+42
| |\
| | * avoid creating a set if no where values are removedAaron Patterson2013-05-212-0/+14
| | * remove bind values for where clauses that were removedAaron Patterson2013-05-212-9/+18
| | * push partitioning up so bind elimination can get the removed wheresAaron Patterson2013-05-211-5/+3
| | * push partion logic down and initialization logic upAaron Patterson2013-05-211-15/+11
| | * partition the where values so we can access the removed onesAaron Patterson2013-05-201-1/+6
| * | Merge pull request #10711 from senny/10660_rake_db_test_prepare_needs_configRafael Mendonça França2013-05-211-1/+1
| |\ \
| | * | the rake task `db:test:prepare` needs to load the configurationYves Senn2013-05-211-1/+1
| | |/
| * | Merge pull request #10702 from divineforest/use-total-in-batches-testCarlos Antonio da Silva2013-05-211-7/+5
| |\ \ | | |/ | |/|
| | * In batches test @total was assigned but not used. Use it in tests instead of ...Alexander Balashov2013-05-211-7/+5
| |/
| * eliminate some conditionalsAaron Patterson2013-05-201-3/+3
| * change method name to reflect what it actually does.Aaron Patterson2013-05-201-2/+2
| * save the where values in variables so we don't need to look them up allAaron Patterson2013-05-201-4/+5
| * pass where values to the helper function rather than rely on internal stateAaron Patterson2013-05-201-4/+4
| * Merge pull request #10697 from zhubert/patch-1Steve Klabnik2013-05-201-1/+1
| |\
| | * Spelling correction in Upgrading GuideZack Hubert2013-05-201-1/+1
| |/
| * Add has_named_route? to the mapper APIJosé Valim2013-05-202-0/+18
| * No need CHANGELOG entry for a test fixRafael Mendonça França2013-05-201-4/+1
| * Merge pull request #10646 from kennyj/fix_am_20130517Rafael Mendonça França2013-05-202-2/+5
| |\
| | * Fix AM testcase break with mail 2.5.4. It seems that AM's testcase was wrong.kennyj2013-05-172-2/+5
| * | Merge pull request #10692 from vipulnsward/fix_test_3José Valim2013-05-191-1/+1
| |\ \
| | * | Fix wrong `case_sensitive` in uniqueness validity testVipul A M2013-05-201-1/+1
| * | | Merge pull request #10691 from vipulnsward/typo_fix_ar_1Steve Klabnik2013-05-192-2/+2
| |\ \ \ | | |/ / | |/| |
| | * | Fix typo in test name and documentationVipul A M2013-05-202-2/+2
| |/ /
| * | Merge pull request #10688 from elgalu/masterRafael Mendonça França2013-05-191-0/+1
| |\ \
| | * | Missing ending ``` at 14.2 Merging of scopesLeo Gallucci2013-05-191-0/+1
| |/ /
| * | Merge pull request #10659 from vipulnsward/normalize_param2Rafael Mendonça França2013-05-191-3/+3
| |\ \
| | * | "normalize_callback_params" doesn't require name paramVipul A M2013-05-171-3/+3
| * | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2013-05-1914-25/+77
| |\ \ \
| | * | | copy edits[ci skip]Vijay Dev2013-05-193-15/+10
| | * | | Revert "Corrected documentation and added some more for the classify method i...Vijay Dev2013-05-191-14/+5
| | * | | Revert "Changed the CHANGELOG for active_support and improved the doc for inf...Vijay Dev2013-05-192-9/+8
| | * | | Revert "ActionMailer::Collector should be nodoc'd"Vijay Dev2013-05-191-1/+1
| | * | | Revert "nodoc ActionMailer module from lib/action_mailer/*.rb"Vijay Dev2013-05-199-9/+9
| | * | | Revert "Document Rails::Generators::MailerGenerator"Vijay Dev2013-05-191-4/+2
| | * | | Changed the CHANGELOG for active_support and improved the doc for inflector m...aditya-kapoor2013-05-192-8/+9
| | * | | Fix documentation for ActionMailer template names.Megan Bowra-Dean2013-05-171-4/+4
| | * | | Merge pull request #137 from zduci/masterRadu Busuioc2013-05-161-7/+7
| | |\ \ \
| | | * | | Corrected documentation regarding validation errorsRadu Busuioc2013-05-161-7/+7
| | |/ / /
| | * | | Corrected documentation and added some more for the classify method in inflec...aditya-kapoor2013-05-161-5/+14
| | * | | Added some more documentation for define_readers and define_writer of the Ass...aditya-kapoor2013-05-153-0/+15
| | * | | Added some more documentation for ActiveRecord::Associations::Builder::Associ...aditya-kapoor2013-05-151-0/+11
| | * | | Added documentation for ActiveRecord::Associations::Builder::Association classaditya-kapoor2013-05-151-0/+4
| | * | | Document Rails::Generators::MailerGeneratorZachary Scott2013-05-151-2/+4
| | * | | nodoc ActionMailer module from lib/action_mailer/*.rbZachary Scott2013-05-159-9/+9
| | * | | Document ActionMailer::MailHelperZachary Scott2013-05-151-0/+3
| | * | | Document ActionMailer::LogSubscriber and ActionMailer::DeliveryMethods::Class...Zachary Scott2013-05-152-0/+6
| | * | | ActionMailer::Collector should be nodoc'dZachary Scott2013-05-151-1/+1