diff options
| author | Eileen M. Uchitelle <eileencodes@users.noreply.github.com> | 2019-04-05 11:45:48 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-05 11:45:48 -0400 |
| commit | 8c6fedffa1a591360bfe3026e3e75091b120ef82 (patch) | |
| tree | b7744ed40a80be92a9f510b04798f258534293e7 | |
| parent | 969f2c1dc911ab4a919611832ee3392a7b627456 (diff) | |
| parent | c35f7b5115ea34ba6b5d8eacf9405efc24b42a28 (diff) | |
| download | rails-8c6fedffa1a591360bfe3026e3e75091b120ef82.tar.gz rails-8c6fedffa1a591360bfe3026e3e75091b120ef82.tar.bz2 rails-8c6fedffa1a591360bfe3026e3e75091b120ef82.zip | |
Merge pull request #35873 from prathamesh-sonpatki/enqueuing-fixes
Fix the deprecation warning about `config.active_job.return_false_on_aborted_enqueue`
| -rw-r--r-- | activejob/lib/active_job/enqueuing.rb | 2 | ||||
| -rw-r--r-- | guides/source/configuring.md | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/activejob/lib/active_job/enqueuing.rb b/activejob/lib/active_job/enqueuing.rb index 5609d13f5f..c5ee76a69e 100644 --- a/activejob/lib/active_job/enqueuing.rb +++ b/activejob/lib/active_job/enqueuing.rb @@ -67,7 +67,7 @@ module ActiveJob false else ActiveSupport::Deprecation.warn( - "Rails 6.0 will return false when the enqueuing is aborted. Make sure your code doesn't depend on it" \ + "Rails 6.1 will return false when the enqueuing is aborted. Make sure your code doesn't depend on it" \ " returning the instance of the job and set `config.active_job.return_false_on_aborted_enqueue = true`" \ " to remove the deprecations." ) diff --git a/guides/source/configuring.md b/guides/source/configuring.md index e1c9fad232..4033d80d90 100644 --- a/guides/source/configuring.md +++ b/guides/source/configuring.md @@ -784,7 +784,7 @@ There are a few configuration options available in Active Support: * `config.active_job.custom_serializers` allows to set custom argument serializers. Defaults to `[]`. -* `config.active_job.return_false_on_aborted_enqueue` change the return value of `#enqueue` to false instead of the job instance when the enqueuing is aborted. Defaults to `false`. +* `config.active_job.return_false_on_aborted_enqueue` change the return value of `#enqueue` to false instead of the job instance when the enqueuing is aborted. Defaults to `true`. ### Configuring Action Cable |