aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Extract ActionDispatch::Request#deep_mungeGenadi Samokovarov2013-05-303-18/+27
* Merge pull request #10767 from jmondo/masterCarlos Antonio da Silva2013-05-291-1/+1
|\
| * use grep over select for consistency and efficiencyJohn Gesimondo2013-05-281-1/+1
* | Merge pull request #10781 from arunagw/run-isolated-testRafael Mendonça França2013-05-284-37/+13
|\ \
| * | Running isolated testsArun Agrawal2013-05-284-37/+13
* | | Merge pull request #10766 from kylerippey/minor_schema_migration_refactorRafael Mendonça França2013-05-281-18/+24
|\ \ \
| * | | Minor refactor of ActiveRecord::SchemaMigration to remove references to Base,...Kyle Rippey2013-05-261-18/+24
* | | | Merge pull request #10495 from senny/postgres_test_cleanupRafael Mendonça França2013-05-282-30/+30
|\ \ \ \
| * | | | cleanup, assert on warning from postgres adapterYves Senn2013-05-081-1/+1
| * | | | cleanup, switch arguments in assert_equal callsYves Senn2013-05-081-29/+29
* | | | | Merge branch 'fix-test_unit-railtie'Rafael Mendonça França2013-05-281-1/+1
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | No need changelog entryRafael Mendonça França2013-05-281-2/+0
| * | | | condition simplifiedOleg Sukhodolsky2013-05-281-1/+1
| * | | | Merge pull request #10629 from stmpjmpr/bug_10628Rafael Mendonça França2013-05-282-1/+3
|/| | | |
| * | | | Fixes bug 10628.Scott Hill2013-05-152-1/+3
* | | | | Merge pull request #10755 from lukewendling/masterRafael Mendonça França2013-05-281-0/+3
|\ \ \ \ \
| * | | | | add notice to server boot messages if using default 0.0.0.0 bindingLuke Wendling2013-05-251-0/+3
* | | | | | Merge pull request #10775 from senny/postgres_adapter_test_cleanupRafael Mendonça França2013-05-281-5/+1
|\ \ \ \ \ \
| * | | | | | test cleanup, replace `define_method` and `remove_method` with stubs.Yves Senn2013-05-281-5/+1
|/ / / / / /
* | | | | | Merge pull request #10769 from senny/10615_join_should_not_return_readonly_re...Rafael Mendonça França2013-05-275-28/+29
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | `implicit_readonly` is being removed in favor of calling `readonly` explicitlyYves Senn2013-05-275-24/+25
| * | | | | cleanup whitespace in `active_record/relation.rb`.Yves Senn2013-05-271-4/+4
|/ / / / /
* | | | | Merge pull request #10763 from senny/10758_to_sentence_with_blank_elementsCarlos Antonio da Silva2013-05-261-0/+4
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | add test-case for `Array#to_sentence with blank items.Yves Senn2013-05-261-0/+4
| |/ / /
* | | | Merge pull request #10762 from vipulnsward/change_compatibilityCarlos Antonio da Silva2013-05-261-3/+3
|\ \ \ \
| * | | | compatability => compatibilityVipul A M2013-05-261-3/+3
| |/ / /
* | | | Merge pull request #10761 from vipulnsward/fix-typo-1Carlos Antonio da Silva2013-05-264-4/+4
|\ \ \ \ | |/ / / |/| | |
| * | | Fix some typo in method names, variablesVipul A M2013-05-264-4/+4
* | | | Add note about decorator loading in Engines guide.Steve Klabnik2013-05-241-0/+26
|/ / /
* | | 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