| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge pull request #15571 from kalmanh/patch-1 | Richard Schneeman | 2014-06-08 | 1 | -0/+1 |
|\ |
|
| * | Update migrations.md | Kalman Hazins | 2014-06-08 | 1 | -0/+1 |
|/ |
|
* | Ignore distressingly-frequent segfaults on this build | Matthew Draper | 2014-06-08 | 1 | -0/+2 |
* | Merge pull request #15545 from zuhao/refactor_actionpack_assert_select_test | Yves Senn | 2014-06-08 | 1 | -1/+4 |
|\ |
|
| * | Restore test deliveries for ActionMailer. | Zuhao Wan | 2014-06-07 | 1 | -1/+4 |
* | | Merge pull request #15452 from matthewd/live-abort | Matthew Draper | 2014-06-08 | 4 | -13/+189 |
|\ \ |
|
| * | | Handle client disconnect during live streaming | Matthew Draper | 2014-06-08 | 4 | -13/+189 |
* | | | Merge pull request #15567 from aditya-kapoor/add-cases | Rafael Mendonça França | 2014-06-07 | 1 | -0/+11 |
|\ \ \ |
|
| * | | | Add Missing Test Cases for the constantize | Aditya Kapoor | 2014-06-07 | 1 | -0/+11 |
| |/ / |
|
* | | | Merge pull request #15566 from kuldeepaggarwal/fix-build | Rafael Mendonça França | 2014-06-07 | 1 | -3/+3 |
|\ \ \ |
|
| * | | | fix test cases after #15558 merge to master. | Kuldeep Aggarwal | 2014-06-07 | 1 | -3/+3 |
|/ / / |
|
* | | | Merge pull request #15558 from sgrif/sg-rename-property | Rafael Mendonça França | 2014-06-07 | 7 | -25/+25 |
|\ \ \ |
|
| * | | | Rename `property` to `attribute` | Sean Griffin | 2014-06-07 | 8 | -26/+26 |
* | | | | Merge pull request #15546 from sgrif/sg-lazy-decorators | Rafael Mendonça França | 2014-06-07 | 7 | -16/+179 |
|\ \ \ \
| |_|/ /
|/| | | |
|
| * | | | Don't query the database schema when calling `serialize` | Sean Griffin | 2014-06-07 | 7 | -16/+179 |
| | |/
| |/| |
|
* | | | Merge pull request #15561 from sgrif/sg-time-zone-aware-arrays | Rafael Mendonça França | 2014-06-07 | 2 | -1/+13 |
|\ \ \ |
|
| * | | | Ensure time zones don't change after round trip with array columns | Sean Griffin | 2014-06-07 | 2 | -1/+13 |
* | | | | Merge pull request #15562 from sgrif/sg-double-type-cast-dirty | Rafael Mendonça França | 2014-06-07 | 5 | -25/+27 |
|\ \ \ \ |
|
| * | | | | Do not type cast twice on attribute assignment | Sean Griffin | 2014-06-07 | 5 | -25/+27 |
| |/ / / |
|
* | | | | Merge pull request #15560 from aditya-kapoor/guide-fixes | Rafael Mendonça França | 2014-06-07 | 1 | -7/+6 |
|\ \ \ \ |
|
| * | | | | Correct Example output in Rails guides [ci skip] | Aditya Kapoor | 2014-06-07 | 1 | -7/+6 |
| | |_|/
| |/| | |
|
* | | | | Merge pull request #15564 from sgrif/sg-remove-dead-code | Rafael Mendonça França | 2014-06-07 | 1 | -7/+2 |
|\ \ \ \ |
|
| * | | | | Remove dead branch when restoring ID within a transaction | Sean Griffin | 2014-06-07 | 1 | -7/+2 |
* | | | | | Merge pull request #15565 from sgrif/sg-no-unfreezing | Rafael Mendonça França | 2014-06-07 | 2 | -4/+8 |
|\ \ \ \ \
| |/ / / /
|/| | | | |
|
| * | | | | Move conditionals about freezing closer to the definition of `freeze` | Sean Griffin | 2014-06-07 | 2 | -4/+8 |
|/ / / / |
|
* | | | | Merge pull request #15563 from sgrif/sg-raw-attributes-access | Rafael Mendonça França | 2014-06-07 | 2 | -3/+3 |
|\ \ \ \
| |_|/ /
|/| | | |
|
| * | | | Remove duplicated `@raw_attributes.keys` | Sean Griffin | 2014-06-07 | 2 | -3/+3 |
|/ / / |
|
* | | | Merge pull request #15557 from sgrif/sg-specify-time-zone | Matthew Draper | 2014-06-08 | 1 | -5/+10 |
|\ \ \ |
|
| * | | | Don't rely on `Time.current` in tests | Sean Griffin | 2014-06-07 | 1 | -5/+10 |
| |/ / |
|
* / / | changelog for #15556 and credit @kuldeepaggarwal [Kuldeep Aggarwal] | Yves Senn | 2014-06-07 | 2 | -2/+6 |
|/ / |
|
* | | Merge pull request #15556 from sgrif/sg-time-zone-aware-arrays | Yves Senn | 2014-06-07 | 2 | -1/+29 |
|\ \ |
|
| * | | Add array support when time zone aware attributes are enabled | Sean Griffin | 2014-06-07 | 2 | -1/+29 |
* | | | adds some details to the rationale of converted_arrays [ci skip] | Xavier Noria | 2014-06-07 | 2 | -1/+5 |
* | | | adds a regression test for the strong params converted arrays cache | Xavier Noria | 2014-06-07 | 1 | -1/+18 |
* | | | Revert "Convert StrongParameters cache to a hash. This fixes an unbounded" | Xavier Noria | 2014-06-07 | 2 | -7/+7 |
* | | | copy edits [ci skip] | Vijay Dev | 2014-06-07 | 2 | -2/+2 |
* | | | Merge branch 'master' of github.com:rails/docrails | Vijay Dev | 2014-06-07 | 2 | -4/+13 |
|\ \ \ |
|
| * | | | [ci skip] remove double "in your" | schneems | 2014-06-04 | 1 | -1/+1 |
| * | | | [ci skip] explain association behavior. | schneems | 2014-06-02 | 1 | -0/+6 |
| * | | | [ci skip] add fixture docs link to guides | schneems | 2014-06-02 | 1 | -1/+3 |
| * | | | [ci skip] less derogatory explanation of defaults | schneems | 2014-06-02 | 1 | -2/+3 |
| * | | | [ci skip] fix "note" syntax | schneems | 2014-06-02 | 1 | -1/+1 |
* | | | | Merge pull request #15555 from akshay-vishnoi/doc_changes | Xavier Noria | 2014-06-07 | 8 | -26/+26 |
|\ \ \ \ |
|
| * | | | | [ci skip] Fix capitalization | Akshay Vishnoi | 2014-06-07 | 8 | -26/+26 |
|/ / / / |
|
* | | | | Merge pull request #15542 from Gaurav2728/gaurav-remove_shutdown_link | Arthur Nogueira Neves | 2014-06-06 | 9 | -15/+17 |
|\ \ \ \ |
|
| * | | | | remove rubyforge.org that was shut down [ci skip] | Gaurav Sharma | 2014-06-06 | 9 | -15/+17 |
* | | | | | Unwrap another html_escape | Matthew Draper | 2014-06-07 | 1 | -2/+2 |
* | | | | | Merge pull request #15554 from sgrif/sg-klass | Rafael Mendonça França | 2014-06-06 | 6 | -21/+0 |
|\ \ \ \ \
| |_|_|/ /
|/| | | | |
|
| * | | | | Removed unused `klass` definitions from types | Sean Griffin | 2014-06-06 | 6 | -21/+0 |
|/ / / / |
|
* | | | | eliminate more wasteful allocations | Aaron Patterson | 2014-06-06 | 1 | -2/+2 |