aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | Merge pull request #15597 from eileencodes/reuse-available-collection-methodsRafael Mendonça França2014-06-093-5/+5
|\ \ \ \ \ \
| * | | | | | reuse available collection? check instead of macroeileencodes2014-06-093-5/+5
|/ / / / / /
* | | | | | Merge pull request #15596 from eileencodes/add-has_one-method-and-reuseRafael Mendonça França2014-06-095-5/+9
|\ \ \ \ \ \
| * | | | | | add has_one? method and reuse instead of checking macroeileencodes2014-06-095-5/+9
* | | | | | | Merge pull request #15595 from eileencodes/abstract-away-habtm-macroAaron Patterson2014-06-092-2/+9
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Abstract away use of HABTM macroeileencodes2014-06-092-2/+9
* | | | | | | Fix bug that make HashWithIndifferentAccess work differently of HashRafael Mendonça França2014-06-092-1/+9
* | | | | | | Timestamp values should be present on callbacksRafael Mendonça França2014-06-094-23/+15
| |/ / / / / |/| | | | |
* | | | | | Merge pull request #15592 from sgrif/sg-type-cast-from-databaseRafael Mendonça França2014-06-0926-132/+135
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Rename `type_cast` to `type_cast_from_database`Sean Griffin2014-06-0926-132/+135
|/ / / / /
* | | | | Merge pull request #15586 from sgrif/sg-identity-typeRafael Mendonça França2014-06-091-1/+1
|\ \ \ \ \
| * | | | | Use an actual identity type in AR::Result#identity_typeSean Griffin2014-06-091-1/+1
| | |/ / / | |/| | |
* | | | | Merge pull request #15587 from sgrif/sg-remove-workaroundRafael Mendonça França2014-06-091-15/+8
|\ \ \ \ \
| * | | | | Remove workaround for non-lazy serialize in testsSean Griffin2014-06-091-15/+8
| | |_|/ / | |/| | |
* | | | | Merge pull request #15591 from sgrif/sg-rm-write-attributeRafael Mendonça França2014-06-0915-64/+64
|\ \ \ \ \
| * | | | | Make `_before_type_cast` actually be before type castSean Griffin2014-06-0915-64/+64
| |/ / / /
* | | / / Do not try to set the foreign_key again on has_many throughRafael Mendonça França2014-06-091-1/+1
| |_|/ / |/| | |
* | | | Merge pull request #15588 from thedarkone/remove-has-one-order-optionRafael Mendonça França2014-06-091-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Remove a long gone :order option from has_one's valid_options.thedarkone2014-06-091-1/+1
|/ / /
* / / pg guide, add index to PostgreSQL array example. [ci skip]Yves Senn2014-06-091-1/+3
|/ /
* | Merge pull request #15573 from bf4/mail_2_6_1_releasedRafael Mendonça França2014-06-081-1/+0
|\ \
| * | Mail 2.6.1 silences excessive warnings; remove Gemfile hackBenjamin Fleischer2014-06-081-1/+0
|/ /
* | Merge pull request #15571 from kalmanh/patch-1Richard Schneeman2014-06-081-0/+1
|\ \
| * | Update migrations.mdKalman Hazins2014-06-081-0/+1
|/ /
* | Ignore distressingly-frequent segfaults on this buildMatthew Draper2014-06-081-0/+2
* | Merge pull request #15545 from zuhao/refactor_actionpack_assert_select_testYves Senn2014-06-081-1/+4
|\ \
| * | Restore test deliveries for ActionMailer.Zuhao Wan2014-06-071-1/+4
* | | Merge pull request #15452 from matthewd/live-abortMatthew Draper2014-06-084-13/+189
|\ \ \
| * | | Handle client disconnect during live streamingMatthew Draper2014-06-084-13/+189
* | | | Merge pull request #15567 from aditya-kapoor/add-casesRafael Mendonça França2014-06-071-0/+11
|\ \ \ \
| * | | | Add Missing Test Cases for the constantizeAditya Kapoor2014-06-071-0/+11
| |/ / /
* | | | Merge pull request #15566 from kuldeepaggarwal/fix-buildRafael Mendonça França2014-06-071-3/+3
|\ \ \ \
| * | | | fix test cases after #15558 merge to master.Kuldeep Aggarwal2014-06-071-3/+3
|/ / / /
* | | | Merge pull request #15558 from sgrif/sg-rename-propertyRafael Mendonça França2014-06-077-25/+25
|\ \ \ \
| * | | | Rename `property` to `attribute`Sean Griffin2014-06-078-26/+26
* | | | | 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
|\ \ \ \