Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | :speak_no_evil: :warning: | Akira Matsuda | 2016-02-01 | 2 | -2/+6 | |
* | | | | | | | | Merge pull request #23360 from kamipo/oid_money_precision_is_unused | Rafael França | 2016-01-31 | 2 | -8/+0 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | `OID::Money.precision` is unused since #15239 | Ryuta Kamizono | 2016-01-31 | 2 | -8/+0 | |
| | |/ / / / / / | |/| | | | | | | ||||||
* | | | | | | | | Merge pull request #23388 from prathamesh-sonpatki/update-gemfile-lock | Rafael França | 2016-01-31 | 1 | -1/+0 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Update Gemfile.lock | Prathamesh Sonpatki | 2016-02-01 | 1 | -1/+0 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Merge pull request #23380 from yui-knk/override_calculate_constructables_at_e... | Arthur Nogueira Neves | 2016-01-31 | 1 | -8/+13 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Remove `case macro` from `calculate_constructable` | yui-knk | 2016-02-01 | 1 | -8/+13 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Merge pull request #23387 from mcfiredrill/clarify-touching-callbacks | Kasper Timm Hansen | 2016-01-31 | 1 | -0/+2 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | clarify the touch true option does not trigger after_save/update [ci skip] | Tony Miller | 2016-02-01 | 1 | -0/+2 | |
* | | | | | | | | | Merge pull request #23370 from maclover7/actioncable-main-travis-build | Guillermo Iguaran | 2016-01-31 | 2 | -10/+0 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Remove unused method | Jon Moss | 2016-01-31 | 1 | -9/+0 | |
| * | | | | | | | | | Move Action Cable back to the main build | Jon Moss | 2016-01-30 | 1 | -1/+0 | |
| | |_|/ / / / / / | |/| | | | | | | | ||||||
* | | | | | | | | | Merge pull request #22857 from bdewater/interlock-doc | Vipul A M | 2016-02-01 | 4 | -8/+9 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Update middleware docs regarding ActionDispatch::LoadInterlock [ci skip] | Bart de Water | 2016-01-31 | 4 | -9/+10 | |
* | | | | | | | | | | Merge pull request #23169 from y-yagi/rake_proxy_in_engine | Kasper Timm Hansen | 2016-01-31 | 6 | -40/+127 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | make rake proxy work in rails engines | yuuji.yaginuma | 2016-01-31 | 6 | -40/+127 | |
* | | | | | | | | | | | Merge pull request #23379 from yui-knk/define_association_class_on_each_concr... | Kasper Timm Hansen | 2016-01-31 | 1 | -22/+25 | |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | Each concrete classes have responsibility to return `association_class` | yui-knk | 2016-01-31 | 1 | -22/+25 | |
* | | | | | | | | | | | Drop the runtime dependency on coffee-rails | Matthew Draper | 2016-02-01 | 1 | -1/+0 | |
* | | | | | | | | | | | Wrangle the asset build into something that sounds more general | Matthew Draper | 2016-02-01 | 18 | -17/+51 | |
* | | | | | | | | | | | Merge pull request #23369 from maclover7/actioncable-assets-redux | Matthew Draper | 2016-02-01 | 11 | -7/+49 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Add Action Cable asset building as release step | Jon Moss | 2016-01-30 | 1 | -0/+1 | |
| * | | | | | | | | | | | Improvements and reorganization of assets | Jon Moss | 2016-01-30 | 10 | -3/+10 | |
| * | | | | | | | | | | | Add task to create precompiled action_cable.js and reorganize to accommodate | Javan Makhmali | 2016-01-30 | 10 | -7/+41 | |
| | |_|_|/ / / / / / / | |/| | | | | | | | | | ||||||
* | | | | | | | | | | | Merge pull request #23368 from y-yagi/remove_backward_compatibility_code_for_... | Santiago Pastorino | 2016-01-31 | 1 | -3/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | remove backward compatibility code for Minitest 4 | yuuji.yaginuma | 2016-01-30 | 1 | -3/+0 | |
| | |_|_|_|_|_|/ / / / | |/| | | | | | | | | | ||||||
* | | | | | | | | | | | Wait for EventMachine to finish starting | Matthew Draper | 2016-02-01 | 1 | -0/+1 | |
| |_|/ / / / / / / / |/| | | | | | | | | | ||||||
* | | | | | | | | | | Merge pull request #23371 from kamipo/remove_odd_backtick | Vipul A M | 2016-01-31 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | Remove odd ` [ci skip] | Ryuta Kamizono | 2016-01-31 | 1 | -1/+1 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | Merge pull request #23366 from maclover7/add-configuation-ar-docs | Jon Moss | 2016-01-30 | 1 | -0/+102 | |
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | Add configuration section to "Active Record Basics" guide | Jon Moss | 2016-01-30 | 1 | -0/+102 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Merge pull request #23364 from maclover7/fix-23358 | Jon Moss | 2016-01-30 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Small cleanup to Testing Guide | Jon Moss | 2016-01-30 | 1 | -1/+1 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Merge pull request #23358 from vipulnsward/testing-guide-pass-3 | Vipul A M | 2016-01-31 | 1 | -19/+28 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Pass 3 over testing guide | Vipul A M | 2016-01-31 | 1 | -19/+28 | |
* | | | | | | | | | Merge pull request #23363 from pra85/patch-1 | Vipul A M | 2016-01-31 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | typo fix [ci skip] | Prayag Verma | 2016-01-31 | 1 | -1/+1 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | Merge pull request #23362 from vipulnsward/20821-save-doc-update | Jon Moss | 2016-01-30 | 1 | -3/+3 | |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | | ||||||
| * | | | | | | | | - Updated persistence documentation to make it clear that save and save! won'... | Vipul A M | 2016-01-31 | 1 | -3/+3 | |
| |/ / / / / / / | ||||||
* | | | | | | | | Revert "Merge pull request #23346 from kamipo/refactor_oid_money_precision" | Rafael Mendonça França | 2016-01-30 | 2 | -5/+9 | |
* | | | | | | | | Merge pull request #23345 from yui-knk/warning_when_composite_primary_key_is_... | Rafael França | 2016-01-30 | 2 | -0/+13 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Warn if `AR.primary_key` is called for a table who has composite primary key | yui-knk | 2016-01-30 | 2 | -0/+13 | |
| | |/ / / / / / | |/| | | | | | | ||||||
* | | | | | | | | Merge pull request #23349 from kamipo/refactor_column_exists | Rafael França | 2016-01-30 | 1 | -7/+8 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Refactor `column_exists?` in `SchemaStatements` | Ryuta Kamizono | 2016-01-30 | 1 | -7/+8 | |
| |/ / / / / / / | ||||||
* | | | | | | | | Merge pull request #23355 from kamipo/fix_bigint_for_enum_columns | Rafael França | 2016-01-30 | 3 | -2/+7 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Fix `bigint?` for Enum columns in MySQL | Ryuta Kamizono | 2016-01-31 | 3 | -2/+7 | |
* | | | | | | | | | Merge pull request #23350 from kamipo/refactor_schema_migration_drop_table | Rafael França | 2016-01-30 | 1 | -4/+1 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Make `SchemaMigration.drop_table` to one SQL | Ryuta Kamizono | 2016-01-30 | 1 | -4/+1 | |
| | |/ / / / / / / | |/| | | | | | | | ||||||
* | | | | | | | | | Merge pull request #23352 from yui-knk/move_test_conditions | Rafael França | 2016-01-30 | 1 | -11/+9 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | There is no need to define test if a connection does not support primary_key | yui-knk | 2016-01-31 | 1 | -11/+9 | |
| | |/ / / / / / / | |/| | | | | | | |