aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #26682 from matthewd/cable-testsMatthew Draper2016-10-025-63/+96
|\ | | | | Use websocket-client-simple instead of Faye in tests
| * Use websocket-client-simple instead of Faye as a websockets clientMatthew Draper2016-10-023-63/+87
| | | | | | | | | | | | Mostly, this is just to avoid EventMachine. But there's also an argument to be made that we're better off using a different protocol library for our test suite than the one we use to implement the server.
| * 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`
| * Fix `ActiveSupport::TimeWithZone#localtime`Thomas Balthazar2016-10-013-1/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously memoization in `localtime` wasn't taking the `utc_offset` parameter into account when returning a cached value. It now caches the computed value depending on the `utc_offset` parameter, e.g: Time.zone = "US/Eastern" t = Time.zone.local(2016,5,2,11) # => Mon, 02 May 2016 11:00:00 EDT -04:00 t.localtime(-7200) # => 2016-05-02 13:00:00 -0200 t.localtime(-3600) # => 2016-05-02 14:00:00 -0100
* | Merge pull request #26678 from larskanis/patch-1Matthew Draper2016-10-021-0/+1
|\ \ | | | | | | Add missing require for zlib in ActiveRecord::Migrator
| * | Add missing require for zlibLars Kanis2016-10-011-0/+1
|/ / | | | | | | | | | | | | | | | | Zlib is used to generate the advisory lock since commit 2c2a8755460 . Using the Migrator fails since then, when it is called without the rails context: NameError: uninitialized constant ActiveRecord::Migrator::Zlib This patch fixes the above error.
* | Remove obsolete comment about class-level respond_toAndrew White2016-10-011-2/+0
| | | | | | | | | | | | The class-level respond_to was extracted in ee77770 to responders gem [ci skip]
* | Merge pull request #26676 from matthewd/no-faye-modeMatthew Draper2016-10-0115-185/+8
|\ \ | | | | | | Remove Faye mode
| * | In-line the configuration points that only existed for Faye supportMatthew Draper2016-10-015-13/+4
| | |
| * | Remove Faye modeMatthew Draper2016-10-0112-175/+7
| | | | | | | | | | | | No deprecation, because it was never documented.
* | | Make PG deadlock error more deterministicMatthew Draper2016-10-011-9/+12
|/ / | | | | | | | | We've seen occasional Travis failures mentioning deadlocks. I think they're escaping from this test.
* | Merge pull request #26547 from ↵Matthew Draper2016-10-019-24/+83
|\ \ | | | | | | | | | | | | | | | palkan/fix/actioncable-confirmation-race-condition Avoid race condition on subscription confirmation
| * | Add Channel#ensure_confirmation_sent; call #subscribe_to_channel after ↵palkan2016-09-227-33/+39
| | | | | | | | | | | | initializing
| * | [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 doc [ci skip]
| * | | 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 notifications
| * | | 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 sockets
| * | | | Buffer writes to the cable socketsMatthew Draper2016-09-284-12/+100
| | | | | | | | | | | | | | | | | | | | | | | | | Otherwise, they can sometimes block, leading to reduced system throughput.
* | | | | Merge pull request #26147 from matthewd/callback-backtraceMatthew Draper2016-10-012-135/+274
|\ \ \ \ \ | |_|_|_|/ |/| | | | Callbacks: leave less lines in the backtrace
| * | | | Tighten the backtrace pollution from passing through callbacksMatthew Draper2016-09-302-135/+274
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Callbacks are everywhere, so it's better if we can avoid making a mess of the backtrace just because we've passed through a callback hook. I'm making no effort to the before/after invocations: those only affect backtraces while they're running. The calls that matter are the ones that remain on the call stack after run_callbacks yields: around callbacks, and internal book-keeping around the before/afters.
* | | | Don't skip in-memory insertion of associations when loaded in validateSean Griffin2016-09-294-16/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was caused by 6d0d83a33f59d9415685852cf77818c41e2e2700. While the bug it's trying to fix is handled if the association is loaded in an after_(create|save) callback, it doesn't handle any cases that load the association before the persistence takes place (validation, or before_* filters). Instead of caring about the timing of persistence, we can just ensure that we're not double adding the record instead. The test from that commit actually broke, but it was not because the bug has been re-introduced. It was because `Bulb` in our test suite is doing funky things that look like STI but isn't STI, so equality comparison didn't happen as the loaded model was of a different class. Fixes #26661.
* | | | 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]
| * | | | 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 again
| * | | | remove `mongrel` once againyuuji.yaginuma2016-09-291-1/+1
| | | | | | | | | | | | | | | | | | | | `mongrel` was removed in #26408. But have back accidentally in #26414.
* | | | | Merge pull request #26402 from mtsmfm/remove-dead-constantsAkira Matsuda2016-09-291-30/+0
|\ \ \ \ \ | |/ / / / |/| | | | Remove dead constants
| * | | | Remove dead constantsFumiaki MATSUSHIMA2016-09-061-30/+0
| | | | | | | | | | | | | | | | | | | | It seems that we forgot to remove some codes on https://github.com/rails/rails/commit/7ab47751068c6480e7e44fc9265a7e690dd4af3b
* | | | | 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]
| * | | | | update description of queue adapter in test [ci skip]yuuji.yaginuma2016-09-281-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `ActiveJob::TestCase` set `TestAdapter` to queue adapter at `before_setup`. https://github.com/rails/rails/blob/master/activejob/lib/active_job/test_helper.rb#L12..L21
* | | | | | Merge pull request #26654 from Neodelf/activesupport_1Jon Moss2016-09-281-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | [ci skip] Remove not necessary whitespace
| * | | | | | [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 text
| * | | | | | | [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 file
| * | | | | | | [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
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | [ci skip] Removes broken performance testing link from the 2.2 release notes
| * | | | | | 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` script
| * | | | | | use `active_support/testing/autorun` in `bin/test` scriptyuuji.yaginuma2016-09-272-1/+9
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 29f0fbd5db643b885665e4a14c7de3bf6c0d9c96 has changed that always call `Minitest.autorun` in `active_support/testing/autorun`. Therefore, when used directly `Minitest.run`, tests are performed twice.
* | | | | | 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)
| * | | | | | Make :as option also set request format (AC::TestCase)Kir Shatrov2016-09-212-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | right now you'd have to specify both :as and :format: ``` post :create, params: { foo: "bar" } as: :json, format: :json ```
* | | | | | | Merge pull request #26640 from Shopify/fix-am-errors-to-hash-default-procRafael França2016-09-272-1/+11
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Do not leak the Errors default proc when calling to_hash or as_json
| * | | | | | | Do not leak the Errors default proc when calling to_hash or as_jsonJean Boussier2016-09-272-1/+11
|/ / / / / / /
* | | | | | | Merge pull request #26636 from y-yagi/fix_typo_in_all_weekप्रथमेश Sonpatki2016-09-271-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | fix typo in `DateAndTime::Calculations#all_week` doc [ci skip]
| * | | | | | | fix typo in `DateAndTime::Calculations#all_week` doc [ci skip]yuuji.yaginuma2016-09-271-1/+1
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | `Date.week_start` does not exist. `Date.beginning_of_week` seems to be correct. Ref: #5339
* | | | | | | Merge pull request #26629 from kamipo/fix_doc_formatJon Moss2016-09-261-3/+3
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | Fix doc format for `RecordFetchWarning` [ci skip]
| * | | | | | Fix doc format for `RecordFetchWarning` [ci skip]Ryuta Kamizono2016-09-271-3/+3
| | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-18 00:32:46 +0000