aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Add Action Cable asset building as release stepJon Moss2016-01-301-0/+1
* Improvements and reorganization of assetsJon Moss2016-01-3010-3/+10
* Add task to create precompiled action_cable.js and reorganize to accommodateJavan Makhmali2016-01-3010-7/+41
* Merge pull request #23366 from maclover7/add-configuation-ar-docsJon Moss2016-01-301-0/+102
|\
| * Add configuration section to "Active Record Basics" guideJon Moss2016-01-301-0/+102
|/
* Merge pull request #23364 from maclover7/fix-23358Jon Moss2016-01-301-1/+1
|\
| * Small cleanup to Testing GuideJon Moss2016-01-301-1/+1
|/
* Merge pull request #23358 from vipulnsward/testing-guide-pass-3Vipul A M2016-01-311-19/+28
|\
| * Pass 3 over testing guideVipul A M2016-01-311-19/+28
* | Merge pull request #23363 from pra85/patch-1Vipul A M2016-01-311-1/+1
|\ \
| * | typo fix [ci skip] Prayag Verma2016-01-311-1/+1
|/ /
* | Merge pull request #23362 from vipulnsward/20821-save-doc-updateJon Moss2016-01-301-3/+3
|\ \
| * | - Updated persistence documentation to make it clear that save and save! won'...Vipul A M2016-01-311-3/+3
| |/
* | Revert "Merge pull request #23346 from kamipo/refactor_oid_money_precision"Rafael Mendonça França2016-01-302-5/+9
* | Merge pull request #23345 from yui-knk/warning_when_composite_primary_key_is_...Rafael França2016-01-302-0/+13
|\ \
| * | Warn if `AR.primary_key` is called for a table who has composite primary keyyui-knk2016-01-302-0/+13
* | | Merge pull request #23349 from kamipo/refactor_column_existsRafael França2016-01-301-7/+8
|\ \ \
| * | | Refactor `column_exists?` in `SchemaStatements`Ryuta Kamizono2016-01-301-7/+8
| |/ /
* | | Merge pull request #23355 from kamipo/fix_bigint_for_enum_columnsRafael França2016-01-303-2/+7
|\ \ \
| * | | Fix `bigint?` for Enum columns in MySQLRyuta Kamizono2016-01-313-2/+7
* | | | Merge pull request #23350 from kamipo/refactor_schema_migration_drop_tableRafael França2016-01-301-4/+1
|\ \ \ \
| * | | | Make `SchemaMigration.drop_table` to one SQLRyuta Kamizono2016-01-301-4/+1
| | |/ / | |/| |
* | | | Merge pull request #23352 from yui-knk/move_test_conditionsRafael França2016-01-301-11/+9
|\ \ \ \
| * | | | There is no need to define test if a connection does not support primary_keyyui-knk2016-01-311-11/+9
| | |/ / | |/| |
* | | | Merge pull request #23353 from kamipo/remove_unused_lost_connection_error_mes...Rafael França2016-01-301-6/+0
|\ \ \ \
| * | | | Remove unused `LOST_CONNECTION_ERROR_MESSAGES`Ryuta Kamizono2016-01-311-6/+0
| | |/ / | |/| |
* | | | Merge pull request #23347 from yui-knk/explicitly_define_columns_as_interfaceRafael França2016-01-301-1/+3
|\ \ \ \
| * | | | Explicitly define `columns` method as an interfaceyui-knk2016-01-301-1/+3
| |/ / /
* | | | Merge pull request #23342 from y-yagi/remove_unused_variableRafael França2016-01-301-1/+1
|\ \ \ \
| * | | | remove unused variable from render testyuuji.yaginuma2016-01-301-1/+1
| |/ / /
* | | | Merge pull request #23343 from y-yagi/remove_unused_requireRafael França2016-01-301-1/+0
|\ \ \ \
| * | | | remove unused requireyuuji.yaginuma2016-01-301-1/+0
| |/ / /
* | | | Allow failures for Action Cable testsRafael Mendonça França2016-01-301-0/+1
* | | | Merge pull request #23351 from y-yagi/remove_gsub_for_action_cable_meta_tagRafael França2016-01-301-1/+0
|\ \ \ \
| * | | | remove unnecessary gsub for `action_cable_meta_tag`yuuji.yaginuma2016-01-301-1/+0
| |/ / /
* | | | Merge pull request #23346 from kamipo/refactor_oid_money_precisionRafael França2016-01-302-9/+5
|\ \ \ \ | |_|/ / |/| | |
| * | | Refactor `OID::Money.precision`Ryuta Kamizono2016-01-302-9/+5
| |/ /
* / / Handle response_body= when body is nileileencodes2016-01-302-0/+17
|/ /
* | Merge pull request #23317 from rfmanuel/after-bundle-in-rails-plugin-templateRafael França2016-01-294-2/+42
|\ \
| * | Implemented pull request changes.Ryan Manuel2016-01-292-10/+5
| * | Update doc with appropriate issue and pull request versionsRyan Manuel2016-01-282-2/+2
| * | Add an after_bundle callback in Rails plugin templatesRyan Manuel2016-01-285-2/+47
* | | Merge pull request #23338 from tawan/update-doc-request-headers-accessJon Moss2016-01-291-1/+15
|\ \ \
| * | | Add additional documentation on Headers#[] [ci skip]Tawan Sierek2016-01-291-1/+15
* | | | Use a gentler disconnectMatthew Draper2016-01-301-2/+2
|/ / /
* | | Don't bother stopping EM between testsMatthew Draper2016-01-301-38/+3
* | | Intervene on change_table as well as create_tableMatthew Draper2016-01-301-0/+13
* | | Merge pull request #23336 from kesha-antonov/patch-1Rafael França2016-01-291-2/+0
|\ \ \
| * | | remove require loggingKesha Antonov2016-01-291-2/+0
|/ / /
* | | Merge pull request #23305 from matthewd/concurrent-take-2Matthew Draper2016-01-3031-117/+738
|\ \ \