Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | Merge pull request #15398 from sgrif/sg-serialized-types | Yves Senn | 2014-05-29 | 10 | -50/+52 | |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | ||||||
| * | | | | | Refactor serialized types to be partially defined as custom properties | Sean Griffin | 2014-05-29 | 10 | -50/+52 | |
* | | | | | | Update url to rake docs [ci skip] | Zachary Scott | 2014-05-29 | 2 | -2/+2 | |
* | | | | | | Merge pull request #15407 from ShunsukeAida/correct_model_name_example | Arthur Nogueira Neves | 2014-05-29 | 2 | -2/+2 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | ||||||
| * | | | | | Name#model_name doesn't return a String object | ShunsukeAida | 2014-05-30 | 2 | -2/+2 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #15406 from sgrif/sg-column-type-override | Rafael Mendonça França | 2014-05-29 | 3 | -1/+51 | |
|\ \ \ \ \ | ||||||
| * | | | | | Result sets never override a model's column type | Sean Griffin | 2014-05-29 | 3 | -1/+51 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #15061 from tgxworld/remove_unnecessary_include | Matthew Draper | 2014-05-29 | 3 | -8/+0 | |
|\ \ \ \ \ | ||||||
| * | | | | | Remove unnecessary include for integration tests. | Guo Xiang Tan | 2014-05-11 | 3 | -8/+0 | |
* | | | | | | Merge pull request #15397 from sgrif/sg-column-class | Yves Senn | 2014-05-29 | 5 | -6/+15 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Ensure we always use instances of the adapter specific column class | Sean Griffin | 2014-05-28 | 5 | -6/+15 | |
* | | | | | | | Merge pull request #15403 from JuanitoFatas/doc/pg-guide-note | Robin Dupret | 2014-05-29 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | [ci skip] Make last note show up in postgresql guide. | Juanito Fatas | 2014-05-29 | 1 | -1/+1 | |
|/ / / / / / / | ||||||
* | | | | | | | Add missing `:param` option from the docs for Mapper#match [ci skip] | Zachary Scott | 2014-05-29 | 1 | -0/+6 | |
* | | | | | | | Add @senny's changed from #14741, including code font for `resources` | Zachary Scott | 2014-05-29 | 1 | -1/+4 | |
* | | | | | | | Merge branch 'master' of github.com:zackperdue/rails into zackperdue-master | Zachary Scott | 2014-05-29 | 1 | -0/+19 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Added documentation for the :param option for resourceful routing | Zack Perdue | 2014-04-14 | 1 | -0/+19 | |
* | | | | | | | | Merge pull request #15399 from tgxworld/remove_todo_router_test | Guillermo Iguaran | 2014-05-28 | 1 | -11/+1 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Remove TODO. | Guo Xiang Tan | 2014-05-28 | 1 | -11/+1 | |
* | | | | | | | | | Use github url for homepage of log4r [ci skip] | Zachary Scott | 2014-05-28 | 1 | -1/+1 | |
* | | | | | | | | | Merge pull request #15384 from zuhao/refactor_actionpack_params_wrapper_test | Yves Senn | 2014-05-29 | 1 | -7/+19 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Clear inflections after test. | Zuhao Wan | 2014-05-28 | 1 | -7/+19 | |
* | | | | | | | | | | Fix indentation from 1b4b26f [ci skip] | Zachary Scott | 2014-05-28 | 1 | -3/+3 | |
* | | | | | | | | | | Merge pull request #15395 from JuanitoFatas/docs/form-helpers | Zachary Scott | 2014-05-28 | 1 | -31/+25 | |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | [ci skip] Improve form_helpers.md guide. | Juanito Fatas | 2014-05-29 | 1 | -31/+25 | |
* | | | | | | | | | | add tests for argument error cases | Aaron Patterson | 2014-05-28 | 1 | -0/+27 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | Merge pull request #15393 from tonytonyjan/patch-2 | Rafael Mendonça França | 2014-05-28 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | Fix documentation | 簡煒航 (Jian Weihang) | 2014-05-29 | 1 | -2/+2 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Merge pull request #15392 from arthurnn/move_open_transactions | Rafael Mendonça França | 2014-05-28 | 2 | -4/+4 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Keep closer to other methods that touch @transaction | Arthur Neves | 2014-05-28 | 2 | -4/+4 | |
* | | | | | | | | | Merge pull request #15390 from sgrif/sg-property-order | Rafael Mendonça França | 2014-05-28 | 2 | -3/+13 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | Maintain column order when overriding existing columns | Sean Griffin | 2014-05-28 | 2 | -3/+13 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Merge pull request #15389 from sgrif/sg-property-inheritance | Rafael Mendonça França | 2014-05-28 | 2 | -5/+26 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Ensure custom properties work correctly with inheritance | Sean Griffin | 2014-05-28 | 2 | -5/+26 | |
* | | | | | | | | | Merge pull request #15370 from sgrif/sg-type-namespace | Rafael Mendonça França | 2014-05-28 | 41 | -643/+592 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Move types to the top level `ActiveRecord` namespace | Sean Griffin | 2014-05-27 | 41 | -643/+592 | |
| | |_|/ / / / / / | |/| | | | | | | | ||||||
* | | | | | | | | | Upgrading Ruby on Rails guide is no longer WIP [ci skip] | Zachary Scott | 2014-05-28 | 1 | -1/+0 | |
* | | | | | | | | | Formatting of content from b1db615 [ci skip] | Zachary Scott | 2014-05-28 | 1 | -3/+7 | |
* | | | | | | | | | Merge pull request #15380 from Gaurav2728/gaurav-transaction_isolation_error | Zachary Scott | 2014-05-28 | 1 | -0/+3 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Initial doc for TransactionIsolationError [ci skip] | Gaurav Sharma | 2014-05-28 | 1 | -0/+3 | |
* | | | | | | | | | | Revert "Merge pull request #12778 from etehtsea/rake-default-fix" | Yves Senn | 2014-05-28 | 2 | -5/+1 | |
| |_|/ / / / / / / |/| | | | | | | | | ||||||
* | | | | | | | | | Merge pull request #15386 from zuhao/refactor_actionpack_request_forgery_prot... | Santiago Pastorino | 2014-05-28 | 1 | -3/+6 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Avoid hardcoded value in teardown. | Zuhao Wan | 2014-05-28 | 1 | -3/+6 | |
* | | | | | | | | | | Merge pull request #15387 from sgrif/sg-remove-column-coder | Santiago Pastorino | 2014-05-28 | 2 | -34/+1 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Remove unused `Column#coder` | Sean Griffin | 2014-05-28 | 2 | -34/+1 | |
| | |_|/ / / / / / / | |/| | | | | | | | | ||||||
* | | | | | | | | | | Merge pull request #15388 from zuhao/refactor_actionpack_send_file_test | Santiago Pastorino | 2014-05-28 | 1 | -2/+6 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Unregister Mime::Type in teardown. | Zuhao Wan | 2014-05-28 | 1 | -2/+6 | |
| | |/ / / / / / / / | |/| | | | | | | | | ||||||
* | | | | | | | | | | Merge pull request #15385 from zuhao/refactor_actionpack_render_other_test | Santiago Pastorino | 2014-05-28 | 1 | -4/+7 | |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | Add and remove renderer inside the test to prevent leak. | Zuhao Wan | 2014-05-28 | 1 | -4/+7 | |
| | |_|/ / / / / / | |/| | | | | | | | ||||||
* | | | | | | | | | Merge pull request #15383 from zuhao/refactor_actionpack_localized_templates_... | Yves Senn | 2014-05-28 | 1 | -10/+8 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | |