aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | Generated engines don't include bin/rake, fixes #15409 [ci skip]Zachary Scott2014-05-291-5/+5
* | | | | | | Merge pull request #15413 from sgrif/sg-i-wish-i-couldRafael Mendonça França2014-05-291-2/+0
|\ \ \ \ \ \ \
| * | | | | | | Don't reference comments that do not existSean Griffin2014-05-291-2/+0
|/ / / / / / /
* | | | | | | Merge pull request #15412 from sgrif/sg-serialized-type-cast-for-writeRafael Mendonça França2014-05-296-86/+47
|\ \ \ \ \ \ \
| * | | | | | | Move `type_cast_for_write` behavior over to the serialized type objectSean Griffin2014-05-296-86/+47
|/ / / / / / /
* | | | | | | Add missing period from 4b802bc [ci skip]Zachary Scott2014-05-291-1/+1
* | | | | | | Merge pull request #15411 from nathany/patch-1Zachary Scott2014-05-291-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Fix broken link in Rails 3.0 release_notesNathan Youngman2014-05-291-1/+1
|/ / / / / / /
* | | | | | | Merge pull request #15398 from sgrif/sg-serialized-typesYves Senn2014-05-2910-50/+52
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Refactor serialized types to be partially defined as custom propertiesSean Griffin2014-05-2910-50/+52
* | | | | | | Update url to rake docs [ci skip]Zachary Scott2014-05-292-2/+2
* | | | | | | Merge pull request #15407 from ShunsukeAida/correct_model_name_exampleArthur Nogueira Neves2014-05-292-2/+2
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Name#model_name doesn't return a String objectShunsukeAida2014-05-302-2/+2
|/ / / / / /
* | | | | | Merge pull request #15406 from sgrif/sg-column-type-overrideRafael Mendonça França2014-05-293-1/+51
|\ \ \ \ \ \
| * | | | | | Result sets never override a model's column typeSean Griffin2014-05-293-1/+51
|/ / / / / /
* | | | | | Merge pull request #15061 from tgxworld/remove_unnecessary_includeMatthew Draper2014-05-293-8/+0
|\ \ \ \ \ \
| * | | | | | Remove unnecessary include for integration tests.Guo Xiang Tan2014-05-113-8/+0
* | | | | | | Merge pull request #15397 from sgrif/sg-column-classYves Senn2014-05-295-6/+15
|\ \ \ \ \ \ \
| * | | | | | | Ensure we always use instances of the adapter specific column classSean Griffin2014-05-285-6/+15
* | | | | | | | Merge pull request #15403 from JuanitoFatas/doc/pg-guide-noteRobin Dupret2014-05-291-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | [ci skip] Make last note show up in postgresql guide.Juanito Fatas2014-05-291-1/+1
|/ / / / / / / /
* | | | | | | | Add missing `:param` option from the docs for Mapper#match [ci skip]Zachary Scott2014-05-291-0/+6
* | | | | | | | Add @senny's changed from #14741, including code font for `resources`Zachary Scott2014-05-291-1/+4
* | | | | | | | Merge branch 'master' of github.com:zackperdue/rails into zackperdue-masterZachary Scott2014-05-291-0/+19
|\ \ \ \ \ \ \ \
| * | | | | | | | Added documentation for the :param option for resourceful routingZack Perdue2014-04-141-0/+19
* | | | | | | | | Merge pull request #15399 from tgxworld/remove_todo_router_testGuillermo Iguaran2014-05-281-11/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Remove TODO.Guo Xiang Tan2014-05-281-11/+1
* | | | | | | | | | Use github url for homepage of log4r [ci skip]Zachary Scott2014-05-281-1/+1
* | | | | | | | | | Merge pull request #15384 from zuhao/refactor_actionpack_params_wrapper_testYves Senn2014-05-291-7/+19
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Clear inflections after test.Zuhao Wan2014-05-281-7/+19
* | | | | | | | | | | Fix indentation from 1b4b26f [ci skip]Zachary Scott2014-05-281-3/+3
* | | | | | | | | | | Merge pull request #15395 from JuanitoFatas/docs/form-helpersZachary Scott2014-05-281-31/+25
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / |/| | | | | | | | | |
| * | | | | | | | | | [ci skip] Improve form_helpers.md guide.Juanito Fatas2014-05-291-31/+25
* | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \