Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | Merge pull request #23151 from maclover7/fix-23148 | Rafael França | 2016-02-01 | 2 | -0/+11 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Add documentation for #17573 | Jon Moss | 2016-02-01 | 2 | -0/+11 | |
* | | | | | | | | | | Merge pull request #23402 from hackerkid/master | Richard Schneeman | 2016-02-01 | 1 | -5/+5 | |
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | / / / / / | |_|_|_|/ / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | git protocol replaced with https | Vishnu Ks | 2016-02-02 | 1 | -5/+5 | |
* | | | | | | | | | Merge pull request #23025 from yahonda/shorten_internal_metadata_table_name_l... | Sean Griffin | 2016-02-01 | 6 | -14/+42 | |
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | Rename `active_record_internal_metadatas` to `ar_internal_metadata` | Yasuo Honda | 2016-02-01 | 2 | -0/+28 | |
| * | | | | | | | | Shorten ActiveRecord::InternalMetadata.table_name to ar_internal_metadata | Yasuo Honda | 2016-02-01 | 5 | -14/+14 | |
| |/ / / / / / / | ||||||
* | | | | | | | | Merge pull request #23401 from claudiob/fix-as-changelog-md | Claudio B | 2016-02-01 | 1 | -29/+29 | |
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | ||||||
| * | | | | | | | [ci skip] Properly indent code in markdown | claudiob | 2016-02-01 | 1 | -29/+29 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #23057 from schneems/schneems/default-puma-config | Richard Schneeman | 2016-02-01 | 5 | -3/+64 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Add Default Puma Config | schneems | 2016-01-29 | 5 | -3/+64 | |
* | | | | | | | | Merge pull request #23385 from matthewd/default-subscription-adapter | Matthew Draper | 2016-02-02 | 1 | -4/+2 | |
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | ||||||
| * | | | | | | | Use the in-process subscription adapter for development & test | Matthew Draper | 2016-02-01 | 1 | -4/+2 | |
* | | | | | | | | Merge pull request #23381 from matthewd/uneventful-redis | Matthew Draper | 2016-02-02 | 8 | -35/+212 | |
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | ||||||
| * | | | | | | | Switch the default redis adapter to a single-stream model | Matthew Draper | 2016-02-01 | 8 | -35/+212 | |
* | | | | | | | | Merge pull request #23375 from prathamesh-sonpatki/fix-19835 | Rafael França | 2016-02-01 | 2 | -13/+6 | |
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | ||||||
| * | | | | | | | Fix documentation related to `config.assets.cache_store` [ci skip] | Prathamesh Sonpatki | 2016-02-01 | 2 | -13/+6 | |
* | | | | | | | | tabenai (typo) | Akira Matsuda | 2016-02-01 | 1 | -6/+6 | |
* | | | | | | | | Merge pull request #23391 from erullmann/join_table_indexes | Rafael França | 2016-02-01 | 1 | -0/+4 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Added references option to join tables | Ernst Rullmann | 2016-01-31 | 1 | -0/+4 | |
* | | | | | | | | | Merge pull request #23168 from kamipo/avoid_extra_show_variables_in_migration | Rafael França | 2016-02-01 | 5 | -21/+15 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | Avoid extra `show variables` in migration | Ryuta Kamizono | 2016-02-01 | 5 | -21/+15 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Merge pull request #23359 from kamipo/make_to_primary_key | Rafael França | 2016-02-01 | 4 | -40/+5 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Make to primary key instead of an unique index for internal tables | Ryuta Kamizono | 2016-01-31 | 4 | -40/+5 | |
* | | | | | | | | | Remove development dependencies from actioncable.gemspec | Matthew Draper | 2016-02-01 | 1 | -9/+0 | |
* | | | | | | | | | Merge pull request #23373 from kamipo/remove_duplicated_composite_primary_key... | Rafael França | 2016-02-01 | 3 | -17/+1 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Remove duplicated composite primary key tests | Ryuta Kamizono | 2016-02-01 | 3 | -17/+1 | |
* | | | | | | | | | | Merge pull request #23389 from kamipo/extract_explain_pretty_printer | Rafael França | 2016-02-01 | 7 | -119/+137 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Extract `ExplainPrettyPrinter` to appropriate files | Ryuta Kamizono | 2016-02-01 | 7 | -119/+137 | |
| |/ / / / / / / / / | ||||||
* / / / / / / / / / | Revert "Merge pull request #23366 from maclover7/add-configuation-ar-docs" | Rafael Mendonça França | 2016-02-01 | 1 | -102/+0 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | Merge pull request #23372 from kamipo/use_index_in_create_in_test_schema | Rafael França | 2016-02-01 | 2 | -11/+9 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Use `t.index` in `create_table` instead of `add_index` in test schema | Ryuta Kamizono | 2016-01-31 | 2 | -11/+9 | |
| | |/ / / / / / / | |/| | | | | | | | ||||||
* | | | | | | | | | Merge pull request #23374 from prathamesh-sonpatki/migration-compatiblity-tests | Rafael França | 2016-01-31 | 1 | -0/+30 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Added test for backward compatibility of null constraints on timestamp columns | Prathamesh Sonpatki | 2016-01-31 | 1 | -0/+30 | |
| |/ / / / / / / / | ||||||
* | | | | | | | | | :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 |