aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
|/ / / /
* | | | Merge pull request #26659 from y-yagi/remove_mongrel_once_againKasper Timm Hansen2016-09-291-1/+1
|\ \ \ \
| * | | | remove `mongrel` once againyuuji.yaginuma2016-09-291-1/+1
* | | | | Merge pull request #26402 from mtsmfm/remove-dead-constantsAkira Matsuda2016-09-291-30/+0
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Remove dead constantsFumiaki MATSUSHIMA2016-09-061-30/+0
* | | | | Merge pull request #26648 from y-yagi/update_description_of_queue_adapterJon Moss2016-09-281-2/+2
|\ \ \ \ \
| * | | | | update description of queue adapter in test [ci skip]yuuji.yaginuma2016-09-281-2/+2
* | | | | | Merge pull request #26654 from Neodelf/activesupport_1Jon Moss2016-09-281-1/+1
|\ \ \ \ \ \
| * | | | | | [ci skip] Remove not necessary whitespaceAndrey Molchanov2016-09-281-1/+1
* | | | | | | Merge pull request #26653 from Neodelf/new_branch_nameJon Moss2016-09-281-1/+1
|\ \ \ \ \ \ \
| * | | | | | | [ci skip] Use right format textAndrey Molchanov2016-09-281-1/+1
* | | | | | | | Merge pull request #26652 from Neodelf/activesupport_2Jon Moss2016-09-281-2/+2
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | [ci skip] Use class name instead of path to fileAndrey Molchanov2016-09-281-2/+2
|/ / / / / / /
* | | | | | | Merge pull request #26649 from michaellennox/remove_broken_perf_test_linkप्रथमेश Sonpatki2016-09-281-1/+0
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Removes broken performance testing link from the 2.2 release notesMichael Lennox2016-09-281-1/+0
|/ / / / / /
* | | | | | Merge pull request #26637 from y-yagi/prevent_plugin_test_run_twiceKasper Timm Hansen2016-09-272-1/+9
|\ \ \ \ \ \
| * | | | | | use `active_support/testing/autorun` in `bin/test` scriptyuuji.yaginuma2016-09-272-1/+9
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #26573 from kirs/action-controller-as-formatRafael França2016-09-272-4/+9
|\ \ \ \ \ \
| * | | | | | Make :as option also set request format (AC::TestCase)Kir Shatrov2016-09-212-4/+9