aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* require_dependency should allow Pathname-like objects, not just StringBenjamin Fleischer2013-09-302-1/+14
* Merge pull request #10222 from senny/update_bundler_section_in_assets_guideRafael Mendonça França2013-05-231-9/+7
|\
| * asset guide, match application.rb snippets to the generated file [ci skip]Yves Senn2013-04-151-9/+7
* | Merge pull request #10713 from senny/10693_fix_primary_key_option_on_has_manyRafael Mendonça França2013-05-234-2/+15
|\ \
| * | Fix the `:primary_key` option for `has_many` associations.Yves Senn2013-05-234-2/+15
* | | Merge branch 'deprecate-validator-setup'Rafael Mendonça França2013-05-238-42/+61
|\ \ \ | |/ / |/| |
| * | deprecate Validator#setup (to get rid of a respond_to call). validators do th...Nick Sutterer2013-05-238-42/+61
|/ /
* | Add CHANGELOG entry for 99860582b2b1c0fc42bf84c52aac57b243d42678Rafael Mendonça França2013-05-221-0/+6
* | Require only minitest.Rafael Mendonça França2013-05-222-2/+2
* | Merge pull request #10667 from rubys/minitest-autorunRafael Mendonça França2013-05-222-2/+2
|\ \
| * | Eliminate minitest warningsSam Ruby2013-05-172-2/+2
* | | Merge pull request #10725 from neerajdotname/remove_code_duplicationCarlos Antonio da Silva2013-05-221-2/+3
|\ \ \
| * | | remove code duplicationNeeraj Singh2013-05-221-2/+3
|/ / /
* | | Merge pull request #10714 from tkhr/extract_test_from_base_test.rb_in_ARCarlos Antonio da Silva2013-05-224-45/+54
|\ \ \
| * | | Extract AR::Persistence#becomes's test code out from base_test.rbTakehiro Adachi2013-05-222-13/+13
| * | | Extract AR::AttributeMethods#attribute_for_inspect's test code out from base_...Takehiro Adachi2013-05-222-8/+8
| * | | Extract AR::Core#inspect and AR::Core.inspect's test code from base_test.rbTakehiro Adachi2013-05-222-24/+33
* | | | Merge pull request #10722 from jgaskins/patch-1José Valim2013-05-221-0/+1
|\ \ \ \
| * | | | Add ActiveModel requirement to application.rbJamie Gaskins2013-05-221-0/+1
|/ / / /
* | | | reverse comparison because of strange AS behaviorAaron Patterson2013-05-211-1/+1
* | | | just set the default argument, a nil parent should be an errorAaron Patterson2013-05-211-2/+1
* | | | fold the collection rather than multiple assigmentsAaron Patterson2013-05-211-3/+2
* | | | use drop rather than calculate the array lengthAaron Patterson2013-05-211-1/+1
* | | | 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
|\ \ \ \