Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | Merge pull request #15596 from eileencodes/add-has_one-method-and-reuse | Rafael Mendonça França | 2014-06-09 | 5 | -5/+9 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | add has_one? method and reuse instead of checking macro | eileencodes | 2014-06-09 | 5 | -5/+9 | |
* | | | | | | | Merge pull request #15595 from eileencodes/abstract-away-habtm-macro | Aaron Patterson | 2014-06-09 | 2 | -2/+9 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | ||||||
| * | | | | | | Abstract away use of HABTM macro | eileencodes | 2014-06-09 | 2 | -2/+9 | |
* | | | | | | | Fix bug that make HashWithIndifferentAccess work differently of Hash | Rafael Mendonça França | 2014-06-09 | 2 | -1/+9 | |
* | | | | | | | Timestamp values should be present on callbacks | Rafael Mendonça França | 2014-06-09 | 4 | -23/+15 | |
| |/ / / / / |/| | | | | | ||||||
* | | | | | | Merge pull request #15592 from sgrif/sg-type-cast-from-database | Rafael Mendonça França | 2014-06-09 | 26 | -132/+135 | |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | ||||||
| * | | | | | Rename `type_cast` to `type_cast_from_database` | Sean Griffin | 2014-06-09 | 26 | -132/+135 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #15586 from sgrif/sg-identity-type | Rafael Mendonça França | 2014-06-09 | 1 | -1/+1 | |
|\ \ \ \ \ | ||||||
| * | | | | | Use an actual identity type in AR::Result#identity_type | Sean Griffin | 2014-06-09 | 1 | -1/+1 | |
| | |/ / / | |/| | | | ||||||
* | | | | | Merge pull request #15587 from sgrif/sg-remove-workaround | Rafael Mendonça França | 2014-06-09 | 1 | -15/+8 | |
|\ \ \ \ \ | ||||||
| * | | | | | Remove workaround for non-lazy serialize in tests | Sean Griffin | 2014-06-09 | 1 | -15/+8 | |
| | |_|/ / | |/| | | | ||||||
* | | | | | Merge pull request #15591 from sgrif/sg-rm-write-attribute | Rafael Mendonça França | 2014-06-09 | 15 | -64/+64 | |
|\ \ \ \ \ | ||||||
| * | | | | | Make `_before_type_cast` actually be before type cast | Sean Griffin | 2014-06-09 | 15 | -64/+64 | |
| |/ / / / | ||||||
* | | / / | Do not try to set the foreign_key again on has_many through | Rafael Mendonça França | 2014-06-09 | 1 | -1/+1 | |
| |_|/ / |/| | | | ||||||
* | | | | Merge pull request #15588 from thedarkone/remove-has-one-order-option | Rafael Mendonça França | 2014-06-09 | 1 | -1/+1 | |
|\ \ \ \ | |/ / / |/| | | | ||||||
| * | | | Remove a long gone :order option from has_one's valid_options. | thedarkone | 2014-06-09 | 1 | -1/+1 | |
|/ / / | ||||||
* / / | pg guide, add index to PostgreSQL array example. [ci skip] | Yves Senn | 2014-06-09 | 1 | -1/+3 | |
|/ / | ||||||
* | | Merge pull request #15573 from bf4/mail_2_6_1_released | Rafael Mendonça França | 2014-06-08 | 1 | -1/+0 | |
|\ \ | ||||||
| * | | Mail 2.6.1 silences excessive warnings; remove Gemfile hack | Benjamin Fleischer | 2014-06-08 | 1 | -1/+0 | |
|/ / | ||||||
* | | 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 | |
|/ / / |