aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | Merge pull request #26701 from kamipo/restore_gemfile_lock_entriesAndrew White2016-10-041-0/+2
|\ \ \ \ \ \ \
| * | | | | | | Restore missing Gemfile.lock entriesRyuta Kamizono2016-10-041-0/+2
|/ / / / / / /
* | | | | | | Merge pull request #26699 from Neodelf/request_idJon Moss2016-10-031-3/+4
|\ \ \ \ \ \ \
| * | | | | | | [ci-skip] Swap method and its alias, format docAndrey Molchanov2016-10-041-3/+4
* | | | | | | | Don't shut down adapters that haven't been setMatthew Draper2016-10-041-1/+1
|/ / / / / / /
* | | | | | | Merge pull request #26695 from MentalPower/masterEileen M. Uchitelle2016-10-035-22/+27
|\ \ \ \ \ \ \
| * | | | | | | Allow the use of listen's 3.1.x branch.Esteban Santana Santana2016-10-035-22/+27
|/ / / / / / /
* | | | | | | Merge pull request #26555 from chriscarter90/unmatched-constraint-routing-mes...Andrew White2016-10-035-9/+23
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Show an "unmatched constraints" error for mismatching and present paramsChris Carter2016-10-035-9/+23
|/ / / / / /
* | | | | | Temporarily make ACa tests noiser and more predictableMatthew Draper2016-10-031-1/+1
* | | | | | Merge pull request #26425 from prathamesh-sonpatki/fix-nil-issueMatthew Draper2016-10-032-10/+19
|\ \ \ \ \ \
| * | | | | | Fix issue with `cache_key` when the named timestamp column has value nilPrathamesh Sonpatki2016-09-072-10/+19
* | | | | | | Shut down the worker pool - don't kill itMatthew Draper2016-10-031-1/+1
* | | | | | | Merge pull request #26620 from maclover7/jm-ac-pg-bugMatthew Draper2016-10-032-2/+39
|\ \ \ \ \ \ \
| * | | | | | | Add tests for Server::Base#restartJon Moss2016-10-021-0/+33
| * | | | | | | Move behavior to Server::Base, and flush pubsubJon Moss2016-10-022-3/+6
| * | | | | | | Shutdown pubsub connection before classes are reloadedJon Moss2016-10-021-0/+1
| | |_|_|/ / / | |/| | | | |
* | | | | | | Cache to_time to improve performance when comparingAndrew White2016-10-021-1/+5
* | | | | | | Revert "Merge pull request #25880 from ryandv/fix_performance_regression_in_t...Andrew White2016-10-021-1/+1
* | | | | | | Revert "Merge pull request #26677 from tbalthazar/26644"Andrew White2016-10-023-30/+1
|/ / / / / /
* | | | | | Merge pull request #26683 from y-yagi/add_cached_key_to_sql_active_record_eventJon Moss2016-10-021-6/+7
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | add `cached` key to `sql.active_record` event [ci skip]yuuji.yaginuma2016-10-021-6/+7
* | | | | | Merge pull request #26672 from schpet/support_ruby_keywords_as_template_localsMatthew Draper2016-10-026-1/+47
|\ \ \ \ \ \
| * | | | | | Change render to support any hash keys in localsPeter Schilling2016-10-026-1/+47
| |/ / / / /
* | | | | | Merge pull request #26682 from matthewd/cable-testsMatthew Draper2016-10-025-63/+96
|\ \ \ \ \ \
| * | | | | | Use websocket-client-simple instead of Faye as a websockets clientMatthew Draper2016-10-023-63/+87
| * | | | | | Shut down EventMachine before re-enabling warningsMatthew Draper2016-10-022-0/+9
* | | | | | | Merge pull request #26677 from tbalthazar/26644Andrew White2016-10-013-1/+30
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Fix `ActiveSupport::TimeWithZone#localtime`Thomas Balthazar2016-10-013-1/+30
* | | | | | | Merge pull request #26678 from larskanis/patch-1Matthew Draper2016-10-021-0/+1
|\ \ \ \ \ \ \
| * | | | | | | Add missing require for zlibLars Kanis2016-10-011-0/+1
|/ / / / / / /
* | | | | | | Remove obsolete comment about class-level respond_toAndrew White2016-10-011-2/+0
* | | | | | | Merge pull request #26676 from matthewd/no-faye-modeMatthew Draper2016-10-0115-185/+8
|\ \ \ \ \ \ \
| * | | | | | | In-line the configuration points that only existed for Faye supportMatthew Draper2016-10-015-13/+4
| * | | | | | | Remove Faye modeMatthew Draper2016-10-0112-175/+7
* | | | | | | | Make PG deadlock error more deterministicMatthew Draper2016-10-011-9/+12
|/ / / / / / /
* | | | | | | Merge pull request #26547 from palkan/fix/actioncable-confirmation-race-condi...Matthew Draper2016-10-019-24/+83
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Add Channel#ensure_confirmation_sent; call #subscribe_to_channel after initia...palkan2016-09-227-33/+39
| * | | | | | [Fix #25381] Avoid race condition on subscription confirmationpalkan2016-09-206-15/+60
* | | | | | | Merge pull request #26675 from j1wilmot/update-docsJon Moss2016-09-301-1/+0
|\ \ \ \ \ \ \
| * | | | | | | Remove dup distinct from AR query list [ci skip]Jeremy Wilmot2016-09-301-1/+0
|/ / / / / / /
* | | | | | | Merge pull request #26584 from Shopify/cached-query-nameRafael França2016-09-304-11/+18
|\ \ \ \ \ \ \
| * | | | | | | Preserve cached queries name in AS notificationsJean Boussier2016-09-224-11/+18
* | | | | | | | Merge pull request #26646 from matthewd/cable-bufferMatthew Draper2016-10-014-12/+100
|\ \ \ \ \ \ \ \
| * | | | | | | | Buffer writes to the cable socketsMatthew Draper2016-09-284-12/+100
* | | | | | | | | Merge pull request #26147 from matthewd/callback-backtraceMatthew Draper2016-10-012-135/+274
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | Tighten the backtrace pollution from passing through callbacksMatthew Draper2016-09-302-135/+274
|/ / / / / / / /
* | | | | | | | Don't skip in-memory insertion of associations when loaded in validateSean Griffin2016-09-294-16/+43
* | | | | | | | Merge pull request #26660 from unasuke/fix_typo_in_5_0_release_notesVipul A M2016-09-291-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix typo in 5_0_release_notes.md doc [ci skip]Yusuke Nakamura2016-09-291-1/+1
|/ / / / / / / /