aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | Fix documentation related to `config.assets.cache_store` [ci skip]Prathamesh Sonpatki2016-02-012-13/+6
* | | | | | | tabenai (typo)Akira Matsuda2016-02-011-6/+6
* | | | | | | Merge pull request #23391 from erullmann/join_table_indexesRafael França2016-02-011-0/+4
|\ \ \ \ \ \ \
| * | | | | | | Added references option to join tablesErnst Rullmann2016-01-311-0/+4
* | | | | | | | Merge pull request #23168 from kamipo/avoid_extra_show_variables_in_migrationRafael França2016-02-015-21/+15
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Avoid extra `show variables` in migrationRyuta Kamizono2016-02-015-21/+15
|/ / / / / / /
* | | | | | | Merge pull request #23359 from kamipo/make_to_primary_keyRafael França2016-02-014-40/+5
|\ \ \ \ \ \ \
| * | | | | | | Make to primary key instead of an unique index for internal tablesRyuta Kamizono2016-01-314-40/+5
* | | | | | | | Remove development dependencies from actioncable.gemspecMatthew Draper2016-02-011-9/+0
* | | | | | | | Merge pull request #23373 from kamipo/remove_duplicated_composite_primary_key...Rafael França2016-02-013-17/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove duplicated composite primary key testsRyuta Kamizono2016-02-013-17/+1
* | | | | | | | | Merge pull request #23389 from kamipo/extract_explain_pretty_printerRafael França2016-02-017-119/+137
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Extract `ExplainPrettyPrinter` to appropriate filesRyuta Kamizono2016-02-017-119/+137
| |/ / / / / / / /
* / / / / / / / / Revert "Merge pull request #23366 from maclover7/add-configuation-ar-docs"Rafael Mendonça França2016-02-011-102/+0
|/ / / / / / / /
* | | | | | | | Merge pull request #23372 from kamipo/use_index_in_create_in_test_schemaRafael França2016-02-012-11/+9
|\ \ \ \ \ \ \ \
| * | | | | | | | Use `t.index` in `create_table` instead of `add_index` in test schemaRyuta Kamizono2016-01-312-11/+9
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge pull request #23374 from prathamesh-sonpatki/migration-compatiblity-testsRafael França2016-01-311-0/+30
|\ \ \ \ \ \ \ \
| * | | | | | | | Added test for backward compatibility of null constraints on timestamp columnsPrathamesh Sonpatki2016-01-311-0/+30
| |/ / / / / / /
* | | | | | | | :speak_no_evil: :warning:Akira Matsuda2016-02-012-2/+6
* | | | | | | | 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
|\ \ \ \ \ \ \ \