aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | Merge pull request #24053 from mohitnatoo/rails-dev-cacheKasper Timm Hansen2016-03-041-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | - using rails dev:cache instead of rake dev:cache in test caseMohit Natoo2016-03-041-1/+1
* | | | | | | | | Merge pull request #24050 from mohitnatoo/rails-routes-railtiesKasper Timm Hansen2016-03-041-7/+7
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | making a test definition more clear.Mohit Natoo2016-03-041-1/+1
| * | | | | | | | | [ci skip] using correcting test case names specifying `rails routes` instead ...Mohit Natoo2016-03-041-6/+6
| |/ / / / / / / /
* | | | | | | | | Merge pull request #24057 from javan/actioncable-return-subscriptionJeremy Daer2016-03-041-3/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Return subscription object(s) when updating the collectionJavan Makhmali2016-03-041-3/+4
|/ / / / / / / / /
* | | | | | | | | Merge pull request #24056 from lifo/cable-create-subscriptions-fixJeremy Daer2016-03-041-0/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Make sure ActionCable.Subscriptions#create always returns the newly created s...Pratik Naik2016-03-041-0/+2
|/ / / / / / / / /
* | | | | | | | | Merge pull request #24052 from bquorning/partial-rendering-with-collection-an...Akira Matsuda2016-03-043-1/+7
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix partial rendering with dot in filenameBenjamin Quorning2016-03-043-1/+7
|/ / / / / / / / /
* | | | | | | | | Merge pull request #24049 from mohitnatoo/railties-run-manuallyप्रथमेश Sonpatki2016-03-041-2/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | [ci skip] correcting sentence in description of application.rbMohit Natoo2016-03-041-2/+1
|/ / / / / / / /
* | | | | | | | Merge pull request #24045 from Sarah-Alsinan/patch-4Kasper Timm Hansen2016-03-041-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Update base.rbSarah A2016-03-031-1/+1
|/ / / / / / / /
* | | | | | | | Merge pull request #24042 from Sarah-Alsinan/patch-3Arun Agrawal2016-03-041-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Update GemfileSarah A2016-03-031-1/+1
|/ / / / / / / /
* | | | | | | | Merge pull request #24039 from javan/actioncable-cleanupJeremy Daer2016-03-036-22/+24
|\ \ \ \ \ \ \ \
| * | | | | | | | Store reference to Subscriptions instance for convenienceJavan Makhmali2016-03-031-5/+6
| * | | | | | | | Implicity add Subscription instance to subscriptions collectionJavan Makhmali2016-03-032-13/+12
| * | | | | | | | Share default mount path with client side .jsJavan Makhmali2016-03-033-3/+4
| * | | | | | | | Fix location of default mount path valueJavan Makhmali2016-03-031-2/+3
|/ / / / / / / /
* | | | | | | | Merge pull request #24038 from javan/actioncable-lazy-connection-monitorJeremy Daer2016-03-033-41/+52
|\ \ \ \ \ \ \ \
| * | | | | | | | Defer starting connection monitor until a connection is openedJavan Makhmali2016-03-033-41/+52
|/ / / / / / / /
* | | | | | | | Merge pull request #24021 from y-yagi/add_scaffold_stylesheet_to_guideJon Moss2016-03-031-0/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | add `scaffold_stylesheet` method to guide [ci skip]yuuji.yaginuma2016-03-041-0/+1
* | | | | | | | | Merge pull request #24036 from javan/actioncable-lazy-connectJeremy Daer2016-03-033-9/+10
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | |
| * | | | | | | | Establish WebSocket connection when first subscription is created. Fixes #24026Javan Makhmali2016-03-033-9/+10
|/ / / / / / / /
* | | | | | | | [ci skip] Fix constrain_to documentation.Kasper Timm Hansen2016-03-031-1/+1
* | | | | | | | Rename constrain_to to exclude.Kasper Timm Hansen2016-03-032-7/+8
* | | | | | | | [ci skip] Make collection caching explicit in guides.Kasper Timm Hansen2016-03-031-15/+6
* | | | | | | | Merge pull request #23992 from matthewd/em-optionMatthew Draper2016-03-0431-52/+229
|\ \ \ \ \ \ \ \
| * | | | | | | | Support faye-websocket + EventMachine as an optionMatthew Draper2016-03-0231-52/+229
* | | | | | | | | don't treat all associations with extensions as instance dependent.Yves Senn2016-03-034-1/+33
| |_|_|_|_|/ / / |/| | | | | | |
* | | | | | | | Merge pull request #24027 from mechanicles/a-to-anXavier Noria2016-03-037-12/+12
|\ \ \ \ \ \ \ \
| * | | | | | | | Change 'a HTTP' to 'an HTTP' [ci skip]Santosh Wadghule2016-03-037-12/+12
* | | | | | | | | Merge pull request #24024 from jonatack/niceify-dynamic-routes-deprecation-me...Rafael França2016-03-031-2/+8
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Niceify the dynamic routes deprecation messagesJon Atack2016-03-031-2/+8
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge pull request #24025 from mechanicles/a-to-anJon Moss2016-03-031-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Change 'a HTML' to 'an HTML' [ci skip]Santosh Wadghule2016-03-031-1/+1
| |/ / / / / / /
* | | | | | | | Merge pull request #24023 from danielrhodes/bug/ac-connection-monitor-disconnectMatthew Draper2016-03-042-0/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | ConnectionMonitor is once again notified of disconnectDaniel Rhodes2016-03-032-0/+2
| |/ / / / / / /
* / / / / / / / Prevent nested ExecutionWrapper calls even when using run! directlyMatthew Draper2016-03-042-9/+16
|/ / / / / / /
* | | | | | | Merge pull request #24015 from meinac/active_record_migrations_doc_changesRafael França2016-03-021-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Changed behaviour of timestamps helper by create_table migration generator [c...Mehmet Emin İNAÇ2016-03-031-1/+1
|/ / / / / / /
* | | | | | | Merge pull request #24011 from gsamokovarov/ar-persistence-api-docs-fixRafael França2016-03-021-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Fix a small template misrender in ActiveRecord::PersistenceGenadi Samokovarov2016-03-021-1/+1
|/ / / / / / /
* | | | | | | Merge pull request #23086 from kamipo/deprecate_insert_update_delete_sqlRafael França2016-03-025-60/+17
|\ \ \ \ \ \ \
| * | | | | | | Deprecate `{insert|update|delete}_sql` in `DatabaseStatements`Ryuta Kamizono2016-03-025-60/+17
| | |_|/ / / / | |/| | | | |
* | | | | | | Do not run app.executor callbacks in integration testsJorge Bejar and Santiago Pastorino2016-03-021-11/+2