aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | 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
|/ /
* | Merge pull request #15533 from sgrif/sg-missing-schema-testsYves Senn2014-06-061-0/+29
|\ \
| * | Add missing test cases for schema dumping defaultsSean Griffin2014-06-061-0/+29
* | | credit JoseLuis Torres for #15051. [JoseLuis Torres]Yves Senn2014-06-061-1/+1
* | | `ActiveRecord::SchemaMigration` has no primary key.Yves Senn2014-06-063-0/+24
* | | test refactor, don't hardcode default for `table_name_prefix`.Yves Senn2014-06-061-1/+2
* | | test refactor, don't hardcode `primary_key_prefix_type` default.Yves Senn2014-06-061-0/+3
* | | serialized Type should delegate `type_cast_for_write` to underlying TypeYves Senn2014-06-062-1/+36
|/ /
* | Merge pull request #15503 from sgrif/sg-json-hstore-storageYves Senn2014-06-069-20/+29
|\ \
| * | Bring type casting behavior of hstore/json in line with serializedSean Griffin2014-06-049-20/+29
* | | Merge pull request #15540 from nbibler/http-headers-setYves Senn2014-06-061-8/+21
|\ \ \
| * | | Use a frozen Set instance for CGI_VARIABLES.Nathaniel Bibler2014-06-051-8/+21
* | | | `bin/rake db:migrate:status` works with legacy migration numbers.Yves Senn2014-06-065-4/+22
* | | | docs, update `includes` + `where` example in AR guide. [ci skip]Yves Senn2014-06-061-3/+16
* | | | Merge pull request #14971 from versioncontrol/#14785Yves Senn2014-06-063-1/+26
|\ \ \ \ | |/ / / |/| | |
| * | | Fix Baseclass becomes! subclass.Edo Balvers2014-05-133-1/+26
* | | | Merge pull request #15536 from sgrif/sg-remove-whiny-nil-thingRafael Mendonça França2014-06-051-8/+0
|\ \ \ \
| * | | | Remove optimization that was required with whiny nilsSean Griffin2014-06-051-8/+0
* | | | | Merge pull request #15535 from coreyward/patch-1Rafael Mendonça França2014-06-051-2/+2
|\ \ \ \ \
| * | | | | Avoid misuse of underscore argumentCorey Ward2014-06-051-2/+2
|/ / / / /
* | | | | Merge pull request #15530 from zuhao/refactor_actionpack_reloader_testMatthew Draper2014-06-061-0/+5
|\ \ \ \ \
| * | | | | Reset callbacks after test.Zuhao Wan2014-06-051-0/+5
* | | | | | Merge pull request #15513 from zenspider/remove_flush_output_bufferAaron Patterson2014-06-053-91/+0
|\ \ \ \ \ \