aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | 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
* | | | | Merge pull request #15609 from sgrif/sg-yaml-virtual-columnsRafael Mendonça França2014-06-104-3/+32
|\ \ \ \ \
| * | | | | Keep the types of virtual columns after yaml serializationSean Griffin2014-06-104-3/+32
| |/ / / /
* | | | | Merge pull request #15603 from kuldeepaggarwal/remove-deprecation-methodRafael Mendonça França2014-06-102-37/+0
|\ \ \ \ \
| * | | | | remove depricated Validatior#setupKuldeep Aggarwal2014-06-102-37/+0
* | | | | | Merge pull request #15605 from mekishizufu/fix_cache_digests_rake_tasksRafael Mendonça França2014-06-102-6/+14
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Fix cache_digest rake tasksJiri Pospisil2014-06-102-6/+14
* | | | | | 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
* | | | | | docs, refactor docs about column modifiers. [ci skip] [Matthew Draper & Yves ...Yves Senn2014-06-101-12/+20
* | | | | | Merge pull request #15604 from JuanitoFatas/doc/migrationXavier Noria2014-06-102-2/+2
|\ \ \ \ \ \
| * | | | | | [ci skip] Rename: Rails Database Migration to Active Record Migration.Juanito Fatas2014-06-102-2/+2
|/ / / / / /
* | | | | | Merge pull request #15584 from jamesyang124/issue_15382Yves Senn2014-06-103-1/+19
|\ \ \ \ \ \
| * | | | | | ActiveRecord::FinderMethods.find passes proc parameter #15382James Yang2014-06-103-1/+19
|/ / / / / /
* | | | | | Merge pull request #15602 from JuanitoFatas/doc/type-modifierYves Senn2014-06-101-0/+2
|\ \ \ \ \ \
| * | | | | | [ci skip] Add note about type modifiers that cannot be specified in command l...Juanito Fatas2014-06-101-0/+2
|/ / / / / /
* | | | | | Merge pull request #15599 from arthurnn/HABTMAssociationRafael Mendonça França2014-06-102-2/+2
|\ \ \ \ \ \
| * | | | | | Use HasAndBelongsToMany instead of HABTMArthur Neves2014-06-092-2/+2
|/ / / / / /
* | | | | | 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
|\ \ \ \