Merge pull request #35873 from prathamesh-sonpatki/enqueuing-fixes

Fix the deprecation warning about `config.active_job.return_false_on_aborted_enqueue`
This commit is contained in:
Eileen M. Uchitelle 2019-04-05 11:45:48 -04:00 committed by GitHub
commit 8c6fedffa1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions

View File

@ -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."
)

View File

@ -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