aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* set defaults at the top so we can avoid the ||= testAaron Patterson2014-05-281-6/+9
* add a test for existing mapper functionalityAaron Patterson2014-05-281-0/+12
* add tests for argument error casesAaron Patterson2014-05-281-0/+27
* Merge pull request #15393 from tonytonyjan/patch-2Rafael Mendonça França2014-05-281-2/+2
|\
| * Fix documentation簡煒航 (Jian Weihang)2014-05-291-2/+2
|/
* Merge pull request #15392 from arthurnn/move_open_transactionsRafael Mendonça França2014-05-282-4/+4
|\
| * Keep closer to other methods that touch @transactionArthur Neves2014-05-282-4/+4
* | Merge pull request #15390 from sgrif/sg-property-orderRafael Mendonça França2014-05-282-3/+13
|\ \ | |/ |/|
| * Maintain column order when overriding existing columnsSean Griffin2014-05-282-3/+13
|/
* Merge pull request #15389 from sgrif/sg-property-inheritanceRafael Mendonça França2014-05-282-5/+26
|\
| * Ensure custom properties work correctly with inheritanceSean Griffin2014-05-282-5/+26
* | Merge pull request #15370 from sgrif/sg-type-namespaceRafael Mendonça França2014-05-2841-643/+592
|\ \
| * | Move types to the top level `ActiveRecord` namespaceSean Griffin2014-05-2741-643/+592
* | | Upgrading Ruby on Rails guide is no longer WIP [ci skip]Zachary Scott2014-05-281-1/+0
* | | Formatting of content from b1db615 [ci skip]Zachary Scott2014-05-281-3/+7
* | | Merge pull request #15380 from Gaurav2728/gaurav-transaction_isolation_errorZachary Scott2014-05-281-0/+3
|\ \ \
| * | | Initial doc for TransactionIsolationError [ci skip]Gaurav Sharma2014-05-281-0/+3
* | | | Revert "Merge pull request #12778 from etehtsea/rake-default-fix"Yves Senn2014-05-282-5/+1
| |_|/ |/| |
* | | Merge pull request #15386 from zuhao/refactor_actionpack_request_forgery_prot...Santiago Pastorino2014-05-281-3/+6
|\ \ \
| * | | Avoid hardcoded value in teardown.Zuhao Wan2014-05-281-3/+6
* | | | Merge pull request #15387 from sgrif/sg-remove-column-coderSantiago Pastorino2014-05-282-34/+1
|\ \ \ \
| * | | | Remove unused `Column#coder`Sean Griffin2014-05-282-34/+1
| | |_|/ | |/| |
* | | | Merge pull request #15388 from zuhao/refactor_actionpack_send_file_testSantiago Pastorino2014-05-281-2/+6
|\ \ \ \
| * | | | Unregister Mime::Type in teardown.Zuhao Wan2014-05-281-2/+6
| | |/ / | |/| |
* | | | Merge pull request #15385 from zuhao/refactor_actionpack_render_other_testSantiago Pastorino2014-05-281-4/+7
|\ \ \ \ | |/ / / |/| | |
| * | | Add and remove renderer inside the test to prevent leak.Zuhao Wan2014-05-281-4/+7
* | | | Merge pull request #15383 from zuhao/refactor_actionpack_localized_templates_...Yves Senn2014-05-281-10/+8
|\ \ \ \ | |/ / / |/| | |
| * | | Move I18n.locale setting into setup and teardown.Zuhao Wan2014-05-281-10/+8
| | |/ | |/|
* | | Merge pull request #15381 from zuhao/refactor_actionpack_content_type_testYves Senn2014-05-281-12/+20
|\ \ \ | |/ / |/| |
| * | Add with_default_charset helper.Zuhao Wan2014-05-281-12/+20
|/ /
* / pg, keep `hstore` and `json` attributes as `Hash` in @attributes.Yves Senn2014-05-285-2/+39
|/
* Merge pull request #15374 from sgrif/sg-private-propertiesRafael Mendonça França2014-05-2712-30/+12
|\
| * Remove AR Properties from the public APISean Griffin2014-05-2712-30/+12
* | Add CHANGELOG entry for #15269 [ci skip]Rafael Mendonça França2014-05-271-0/+4
* | Merge pull request #15269 from arunagw/aa-fixes-8930Rafael Mendonça França2014-05-273-1/+42
|\ \
| * | rake railties:install:migrations respects the order of railtiesArun Agrawal2014-05-273-1/+42
* | | Merge pull request #15373 from akshay-vishnoi/test-casesRafael Mendonça França2014-05-271-0/+10
|\ \ \
| * | | Add test case for clear mappingsAkshay Vishnoi2014-05-281-0/+10
* | | | Deprecate all *_filter callbacks in favor of *_action callbacksRafael Mendonça França2014-05-277-218/+228
* | | | rm dead codeAaron Patterson2014-05-271-5/+0
* | | | PARAMETERS_KEY is only used in the request, so move the constant thereAaron Patterson2014-05-273-9/+9
* | | | Merge branch 'constraints'Aaron Patterson2014-05-2711-75/+85
|\ \ \ \ | |/ / / |/| | |
| * | | rm reset_parameters because we automatically do it from 9ca4839aAaron Patterson2014-05-273-9/+0
| * | | move path_parameter encoding check to the request objectAaron Patterson2014-05-273-18/+13
| * | | dispatcher doesn't need `call` anymoreAaron Patterson2014-05-271-4/+0
| * | | call `serve` with the request on dispatchersAaron Patterson2014-05-271-9/+10
| * | | constraints class does not need the request class anymoreAaron Patterson2014-05-271-4/+4
| * | | give all endpoints a superclassAaron Patterson2014-05-274-22/+40
| * | | skip the build business if the stack is emptyAaron Patterson2014-05-261-2/+6
| * | | stop hardcoding path_parameters and get it from the requestAaron Patterson2014-05-261-1/+2