aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #15621 from sgrif/sg-column-type-decorationsRafael Mendonça França2014-06-102-2/+1
|\
| * No need to decorate columns twiceSean Griffin2014-06-102-2/+1
* | remove deprecation call while initializing `ClassCache` objectKuldeep Aggarwal2014-06-112-13/+1
* | Remove deprecated method ActiveRecord::Base.quoted_locking_columnAkshay Vishnoi2014-06-103-10/+4
|/
* Merge pull request #15610 from sgrif/silence-warningsRafael Mendonça França2014-06-102-3/+3
|\
| * Silence warnings in tests.Sean Griffin2014-06-102-3/+3
* | Keep the types of virtual columns after yaml serializationSean Griffin2014-06-104-3/+32
|/
* Merge pull request #15607 from sgrif/sg-array-type-castRafael Mendonça França2014-06-103-34/+28
|\
| * Inline PG array type casting helperSean Griffin2014-06-103-34/+28
* | test, fix typo, `create_index` does not exist.Yves Senn2014-06-101-1/+1
* | ActiveRecord::FinderMethods.find passes proc parameter #15382James Yang2014-06-103-1/+19
* | Use HasAndBelongsToMany instead of HABTMArthur Neves2014-06-092-2/+2
* | 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
* | | Timestamp values should be present on callbacksRafael Mendonça França2014-06-094-23/+15
| |/ |/|
* | 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
| |/ |/|
* | Remove a long gone :order option from has_one's valid_options.thedarkone2014-06-091-1/+1
|/
* 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 #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
* | | | | Move conditionals about freezing closer to the definition of `freeze`Sean Griffin2014-06-072-4/+8
|/ / / /
* / / / 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
* | | Merge branch 'master' of github.com:rails/docrailsVijay Dev2014-06-071-3/+4
|\ \ \
| * | | [ci skip] remove double "in your"schneems2014-06-041-1/+1
| * | | [ci skip] less derogatory explanation of defaultsschneems2014-06-021-2/+3
| * | | [ci skip] fix "note" syntaxschneems2014-06-021-1/+1
* | | | Merge pull request #15542 from Gaurav2728/gaurav-remove_shutdown_linkArthur Nogueira Neves2014-06-061-4/+4
|\ \ \ \