aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #15546 from sgrif/sg-lazy-decoratorsRafael Mendonça França2014-06-077-16/+179
|\
| * Don't query the database schema when calling `serialize`Sean Griffin2014-06-077-16/+179
* | Merge pull request #15561 from sgrif/sg-time-zone-aware-arraysRafael Mendonça França2014-06-072-1/+13
|\ \
| * | Ensure time zones don't change after round trip with array columnsSean Griffin2014-06-072-1/+13
* | | Merge pull request #15562 from sgrif/sg-double-type-cast-dirtyRafael Mendonça França2014-06-075-25/+27
|\ \ \
| * | | Do not type cast twice on attribute assignmentSean Griffin2014-06-075-25/+27
| |/ /
* | | Merge pull request #15560 from aditya-kapoor/guide-fixesRafael Mendonça França2014-06-071-7/+6
|\ \ \
| * | | Correct Example output in Rails guides [ci skip]Aditya Kapoor2014-06-071-7/+6
* | | | Merge pull request #15564 from sgrif/sg-remove-dead-codeRafael Mendonça França2014-06-071-7/+2
|\ \ \ \
| * | | | Remove dead branch when restoring ID within a transactionSean Griffin2014-06-071-7/+2
* | | | | Merge pull request #15565 from sgrif/sg-no-unfreezingRafael Mendonça França2014-06-072-4/+8
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Move conditionals about freezing closer to the definition of `freeze`Sean Griffin2014-06-072-4/+8
|/ / / /
* | | | Merge pull request #15563 from sgrif/sg-raw-attributes-accessRafael Mendonça França2014-06-072-3/+3
|\ \ \ \ | |_|/ / |/| | |
| * | | Remove duplicated `@raw_attributes.keys`Sean Griffin2014-06-072-3/+3
|/ / /
* | | Merge pull request #15557 from sgrif/sg-specify-time-zoneMatthew Draper2014-06-081-5/+10
|\ \ \
| * | | Don't rely on `Time.current` in testsSean Griffin2014-06-071-5/+10
| |/ /
* / / changelog for #15556 and credit @kuldeepaggarwal [Kuldeep Aggarwal]Yves Senn2014-06-072-2/+6
|/ /
* | Merge pull request #15556 from sgrif/sg-time-zone-aware-arraysYves Senn2014-06-072-1/+29
|\ \
| * | Add array support when time zone aware attributes are enabledSean Griffin2014-06-072-1/+29
* | | adds some details to the rationale of converted_arrays [ci skip]Xavier Noria2014-06-072-1/+5
* | | adds a regression test for the strong params converted arrays cacheXavier Noria2014-06-071-1/+18
* | | Revert "Convert StrongParameters cache to a hash. This fixes an unbounded"Xavier Noria2014-06-072-7/+7
* | | copy edits [ci skip]Vijay Dev2014-06-072-2/+2
* | | Merge branch 'master' of github.com:rails/docrailsVijay Dev2014-06-072-4/+13
|\ \ \
| * | | [ci skip] remove double "in your"schneems2014-06-041-1/+1
| * | | [ci skip] explain association behavior. schneems2014-06-021-0/+6
| * | | [ci skip] add fixture docs link to guidesschneems2014-06-021-1/+3
| * | | [ci skip] less derogatory explanation of defaultsschneems2014-06-021-2/+3
| * | | [ci skip] fix "note" syntaxschneems2014-06-021-1/+1
* | | | Merge pull request #15555 from akshay-vishnoi/doc_changesXavier Noria2014-06-078-26/+26
|\ \ \ \
| * | | | [ci skip] Fix capitalizationAkshay Vishnoi2014-06-078-26/+26
|/ / / /
* | | | Merge pull request #15542 from Gaurav2728/gaurav-remove_shutdown_linkArthur Nogueira Neves2014-06-069-15/+17
|\ \ \ \
| * | | | remove rubyforge.org that was shut down [ci skip]Gaurav Sharma2014-06-069-15/+17
* | | | | Unwrap another html_escapeMatthew Draper2014-06-071-2/+2
* | | | | Merge pull request #15554 from sgrif/sg-klassRafael Mendonça França2014-06-066-21/+0
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Removed unused `klass` definitions from typesSean Griffin2014-06-066-21/+0
|/ / / /
* | | | eliminate more wasteful allocationsAaron Patterson2014-06-061-2/+2
* | | | Merge pull request #15552 from sgrif/sg-remove-klass-special-caseRafael Mendonça França2014-06-062-4/+7
|\ \ \ \
| * | | | Remove composed_of special case from multi-parameter attributesSean Griffin2014-06-062-4/+7
* | | | | Merge pull request #15551 from sgrif/sg-numeric-typesRafael Mendonça França2014-06-062-9/+9
|\ \ \ \ \
| * | | | | Don't mess with `_before_type_cast` for numeric typesSean Griffin2014-06-062-9/+9
| |/ / / /
* | | | | remove another wasteful AS::SafeBuffer allocationAaron Patterson2014-06-061-1/+1
* | | | | eliminate wasteful AS::SafeBuffer allocationAaron Patterson2014-06-061-1/+1
* | | | | Revert "Merge pull request #15550 from sgrif/sg-numeric-types"Rafael Mendonça França2014-06-061-8/+7
* | | | | Merge pull request #15550 from sgrif/sg-numeric-typesRafael Mendonça França2014-06-061-7/+8
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Don't mess with `_before_type_cast` for numeric typesSean Griffin2014-06-061-7/+8
|/ / / /
* | | | Merge pull request #15548 from zuhao/refactor_actionmailer_i18n_with_controll...Yves Senn2014-06-061-0/+4
|\ \ \ \ | |/ / / |/| | |
| * | | Restore I18n.locale to default after test.Zuhao Wan2014-06-071-0/+4
|/ / /
* | | Merge pull request #15544 from zuhao/refactor_actionmailer_test_caseSantiago Pastorino2014-06-061-0/+8
|\ \ \ | |_|/ |/| |
| * | Restore test deliveries properly in ActionMailer.Zuhao Wan2014-06-071-0/+8
|/ /