aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | Merge pull request #23360 from kamipo/oid_money_precision_is_unusedRafael França2016-01-312-8/+0
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | `OID::Money.precision` is unused since #15239Ryuta Kamizono2016-01-312-8/+0
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #23388 from prathamesh-sonpatki/update-gemfile-lockRafael França2016-01-311-1/+0
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Update Gemfile.lockPrathamesh Sonpatki2016-02-011-1/+0
|/ / / / / / / / /
* | | | | | | | | Merge pull request #23380 from yui-knk/override_calculate_constructables_at_e...Arthur Nogueira Neves2016-01-311-8/+13
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Remove `case macro` from `calculate_constructable`yui-knk2016-02-011-8/+13
|/ / / / / / / / /
* | | | | | | | | Merge pull request #23387 from mcfiredrill/clarify-touching-callbacksKasper Timm Hansen2016-01-311-0/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | clarify the touch true option does not trigger after_save/update [ci skip]Tony Miller2016-02-011-0/+2
* | | | | | | | | | Merge pull request #23370 from maclover7/actioncable-main-travis-buildGuillermo Iguaran2016-01-312-10/+0
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Remove unused methodJon Moss2016-01-311-9/+0
| * | | | | | | | | | Move Action Cable back to the main buildJon Moss2016-01-301-1/+0
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #22857 from bdewater/interlock-docVipul A M2016-02-014-8/+9
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Update middleware docs regarding ActionDispatch::LoadInterlock [ci skip]Bart de Water2016-01-314-9/+10
* | | | | | | | | | | Merge pull request #23169 from y-yagi/rake_proxy_in_engineKasper Timm Hansen2016-01-316-40/+127
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | make rake proxy work in rails enginesyuuji.yaginuma2016-01-316-40/+127
* | | | | | | | | | | | Merge pull request #23379 from yui-knk/define_association_class_on_each_concr...Kasper Timm Hansen2016-01-311-22/+25
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Each concrete classes have responsibility to return `association_class`yui-knk2016-01-311-22/+25
* | | | | | | | | | | | Drop the runtime dependency on coffee-railsMatthew Draper2016-02-011-1/+0
* | | | | | | | | | | | Wrangle the asset build into something that sounds more generalMatthew Draper2016-02-0118-17/+51
* | | | | | | | | | | | Merge pull request #23369 from maclover7/actioncable-assets-reduxMatthew Draper2016-02-0111-7/+49
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | 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 #23368 from y-yagi/remove_backward_compatibility_code_for_...Santiago Pastorino2016-01-311-3/+0
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | remove backward compatibility code for Minitest 4yuuji.yaginuma2016-01-301-3/+0
| | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Wait for EventMachine to finish startingMatthew Draper2016-02-011-0/+1
| |_|/ / / / / / / / / |/| | | | | | | | | |
* | | | | | | | | | | Merge pull request #23371 from kamipo/remove_odd_backtickVipul A M2016-01-311-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Remove odd ` [ci skip]Ryuta Kamizono2016-01-311-1/+1
|/ / / / / / / / / /
* | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \