Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'bindwhere' | Aaron Patterson | 2013-05-21 | 2 | -20/+42 |
|\ | | | | | | | | | | | | | | | | | * bindwhere: avoid creating a set if no where values are removed remove bind values for where clauses that were removed push partitioning up so bind elimination can get the removed wheres push partion logic down and initialization logic up partition the where values so we can access the removed ones | ||||
| * | avoid creating a set if no where values are removed | Aaron Patterson | 2013-05-21 | 2 | -0/+14 |
| | | |||||
| * | remove bind values for where clauses that were removed | Aaron Patterson | 2013-05-21 | 2 | -9/+18 |
| | | |||||
| * | push partitioning up so bind elimination can get the removed wheres | Aaron Patterson | 2013-05-21 | 1 | -5/+3 |
| | | |||||
| * | push partion logic down and initialization logic up | Aaron Patterson | 2013-05-21 | 1 | -15/+11 |
| | | |||||
| * | partition the where values so we can access the removed ones | Aaron Patterson | 2013-05-20 | 1 | -1/+6 |
| | | |||||
* | | Merge pull request #10711 from senny/10660_rake_db_test_prepare_needs_config | Rafael Mendonça França | 2013-05-21 | 1 | -1/+1 |
|\ \ | | | | | | | the rake task `db:test:prepare` needs to load the configuration | ||||
| * | | the rake task `db:test:prepare` needs to load the configuration | Yves Senn | 2013-05-21 | 1 | -1/+1 |
| |/ | | | | | | | Without loading the configuration the task will not perform any work. | ||||
* | | Merge pull request #10702 from divineforest/use-total-in-batches-test | Carlos Antonio da Silva | 2013-05-21 | 1 | -7/+5 |
|\ \ | |/ |/| | Use @total variable created in the setup of batches tests instead of counting again. | ||||
| * | In batches test @total was assigned but not used. Use it in tests instead of ↵ | Alexander Balashov | 2013-05-21 | 1 | -7/+5 |
|/ | | | | Post.count | ||||
* | eliminate some conditionals | Aaron Patterson | 2013-05-20 | 1 | -3/+3 |
| | |||||
* | change method name to reflect what it actually does. | Aaron Patterson | 2013-05-20 | 1 | -2/+2 |
| | |||||
* | save the where values in variables so we don't need to look them up all | Aaron Patterson | 2013-05-20 | 1 | -4/+5 |
| | | | | the time | ||||
* | pass where values to the helper function rather than rely on internal state | Aaron Patterson | 2013-05-20 | 1 | -4/+4 |
| | |||||
* | Merge pull request #10697 from zhubert/patch-1 | Steve Klabnik | 2013-05-20 | 1 | -1/+1 |
|\ | | | | | Spelling correction in Upgrading Guide [ci skip] | ||||
| * | Spelling correction in Upgrading Guide | Zack Hubert | 2013-05-20 | 1 | -1/+1 |
|/ | | | Fixes spelling of 'erratta' to 'errata' | ||||
* | Add has_named_route? to the mapper API | José Valim | 2013-05-20 | 2 | -0/+18 |
| | |||||
* | No need CHANGELOG entry for a test fix | Rafael Mendonça França | 2013-05-20 | 1 | -4/+1 |
| | | | | [ci skip] | ||||
* | Merge pull request #10646 from kennyj/fix_am_20130517 | Rafael Mendonça França | 2013-05-20 | 2 | -2/+5 |
|\ | | | | | Fix ActionMailer testcase break with mail 2.5.4. | ||||
| * | Fix AM testcase break with mail 2.5.4. It seems that AM's testcase was wrong. | kennyj | 2013-05-17 | 2 | -2/+5 |
| | | |||||
* | | Merge pull request #10692 from vipulnsward/fix_test_3 | José Valim | 2013-05-19 | 1 | -1/+1 |
|\ \ | | | | | | | Fix wrong `case_sensitive` in uniqueness validity test | ||||
| * | | Fix wrong `case_sensitive` in uniqueness validity test | Vipul A M | 2013-05-20 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #10691 from vipulnsward/typo_fix_ar_1 | Steve Klabnik | 2013-05-19 | 2 | -2/+2 |
|\ \ \ | |/ / |/| | | Fix typo in test name and documentation | ||||
| * | | Fix typo in test name and documentation | Vipul A M | 2013-05-20 | 2 | -2/+2 |
|/ / | |||||
* | | Merge pull request #10688 from elgalu/master | Rafael Mendonça França | 2013-05-19 | 1 | -0/+1 |
|\ \ | | | | | | | Missing ending ``` at 14.2 Merging of scopes | ||||
| * | | Missing ending ``` at 14.2 Merging of scopes | Leo Gallucci | 2013-05-19 | 1 | -0/+1 |
|/ / | | | | | http://edgeguides.rubyonrails.org/active_record_querying.html#merging-of-scopes | ||||
* | | Merge pull request #10659 from vipulnsward/normalize_param2 | Rafael Mendonça França | 2013-05-19 | 1 | -3/+3 |
|\ \ | | | | | | | "normalize_callback_params" doesn't require name param | ||||
| * | | "normalize_callback_params" doesn't require name param | Vipul A M | 2013-05-17 | 1 | -3/+3 |
| | | | |||||
* | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2013-05-19 | 14 | -25/+77 |
|\ \ \ | |||||
| * | | | copy edits[ci skip] | Vijay Dev | 2013-05-19 | 3 | -15/+10 |
| | | | | |||||
| * | | | Revert "Corrected documentation and added some more for the classify method ↵ | Vijay Dev | 2013-05-19 | 1 | -14/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | in inflectors" This reverts commit 8f901dee9e2072dd20e0a252a89dd501d783d85b. | ||||
| * | | | Revert "Changed the CHANGELOG for active_support and improved the doc for ↵ | Vijay Dev | 2013-05-19 | 2 | -9/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | inflector method classify" This reverts commit 8d5fcb691e7496900f1c77dff8d6e729c1b56201. Reason: Changelogs are not to be edited in docrails. [ci skip] | ||||
| * | | | Revert "ActionMailer::Collector should be nodoc'd" | Vijay Dev | 2013-05-19 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit e47c85c696de1c4137c222bedc846b2cdbb0893f. Reason: Let's not nodoc without reason. [ci skip] | ||||
| * | | | Revert "nodoc ActionMailer module from lib/action_mailer/*.rb" | Vijay Dev | 2013-05-19 | 9 | -9/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 328e876a1569058e47eaf7ea3f4f045a83b585fa. Reason: Let's not nodoc without reason. [ci skip] | ||||
| * | | | Revert "Document Rails::Generators::MailerGenerator" | Vijay Dev | 2013-05-19 | 1 | -4/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit dfb69f2b8a85586ad70071baba416747cbb07364. Reason: Let's not nodoc without reason. [ci skip] | ||||
| * | | | Changed the CHANGELOG for active_support and improved the doc for inflector ↵ | aditya-kapoor | 2013-05-19 | 2 | -8/+9 |
| | | | | | | | | | | | | | | | | method classify | ||||
| * | | | Fix documentation for ActionMailer template names. | Megan Bowra-Dean | 2013-05-17 | 1 | -4/+4 |
| | | | | | | | | | | | | | | | | ActionMailer templates that are not plain text do not require *.text.* in the name and will fail to be picked up automatically if it is included in the name. | ||||
| * | | | Merge pull request #137 from zduci/master | Radu Busuioc | 2013-05-16 | 1 | -7/+7 |
| |\ \ \ | | | | | | | | | | | Corrected documentation regarding validation errors | ||||
| | * | | | Corrected documentation regarding validation errors | Radu Busuioc | 2013-05-16 | 1 | -7/+7 |
| |/ / / | |||||
| * | | | Corrected documentation and added some more for the classify method in ↵ | aditya-kapoor | 2013-05-16 | 1 | -5/+14 |
| | | | | | | | | | | | | | | | | inflectors | ||||
| * | | | Added some more documentation for define_readers and define_writer of the ↵ | aditya-kapoor | 2013-05-15 | 3 | -0/+15 |
| | | | | | | | | | | | | | | | | Association and its inherited classes | ||||
| * | | | Added some more documentation for ↵ | aditya-kapoor | 2013-05-15 | 1 | -0/+11 |
| | | | | | | | | | | | | | | | | ActiveRecord::Associations::Builder::Association class | ||||
| * | | | Added documentation for ActiveRecord::Associations::Builder::Association class | aditya-kapoor | 2013-05-15 | 1 | -0/+4 |
| | | | | |||||
| * | | | Document Rails::Generators::MailerGenerator | Zachary Scott | 2013-05-15 | 1 | -2/+4 |
| | | | | |||||
| * | | | nodoc ActionMailer module from lib/action_mailer/*.rb | Zachary Scott | 2013-05-15 | 9 | -9/+9 |
| | | | | |||||
| * | | | Document ActionMailer::MailHelper | Zachary Scott | 2013-05-15 | 1 | -0/+3 |
| | | | | |||||
| * | | | Document ActionMailer::LogSubscriber and ↵ | Zachary Scott | 2013-05-15 | 2 | -0/+6 |
| | | | | | | | | | | | | | | | | ActionMailer::DeliveryMethods::ClassMethods | ||||
| * | | | ActionMailer::Collector should be nodoc'd | Zachary Scott | 2013-05-15 | 1 | -1/+1 |
| | | | | |||||
| * | | | Use new hash syntax | Mikhail Dieterle | 2013-05-14 | 1 | -2/+2 |
| | | | | |||||
| * | | | improved doc for ActiveRecord#find_by_sql method (Refs #10599) [ci skip] | Anton Kalyaev | 2013-05-14 | 1 | -3/+4 |
| | | | |