aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorRafael França <rafaelmfranca@gmail.com>2018-12-05 11:24:19 -0500
committerGitHub <noreply@github.com>2018-12-05 11:24:19 -0500
commit299a213a738e078c6fbddd488a711ea9bb066fe2 (patch)
tree2871f9600b1526625b359107e29c84970fdc18c8 /railties
parent647665110f49935b30e29ac09ecfca3701e76041 (diff)
parentee9fc120242b83c64bf77af1b72082ac76319332 (diff)
downloadrails-299a213a738e078c6fbddd488a711ea9bb066fe2.tar.gz
rails-299a213a738e078c6fbddd488a711ea9bb066fe2.tar.bz2
rails-299a213a738e078c6fbddd488a711ea9bb066fe2.zip
Merge pull request #33992 from kirs/enqueue-return-false
Make AJ::Base#enqueue return false if the job wasn't enqueued
Diffstat (limited to 'railties')
-rw-r--r--railties/lib/rails/generators/rails/app/templates/config/initializers/new_framework_defaults_6_0.rb.tt3
1 files changed, 3 insertions, 0 deletions
diff --git a/railties/lib/rails/generators/rails/app/templates/config/initializers/new_framework_defaults_6_0.rb.tt b/railties/lib/rails/generators/rails/app/templates/config/initializers/new_framework_defaults_6_0.rb.tt
index 54eb0cb1d2..5cca8ae570 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/initializers/new_framework_defaults_6_0.rb.tt
+++ b/railties/lib/rails/generators/rails/app/templates/config/initializers/new_framework_defaults_6_0.rb.tt
@@ -15,3 +15,6 @@
# This option is not backwards compatible with earlier Rails versions.
# It's best enabled when your entire app is migrated and stable on 6.0.
# Rails.application.config.action_dispatch.use_cookies_with_metadata = true
+
+# Return false instead of self when #enqueue method was aborted from the callback
+Rails.application.config.active_job.return_false_on_aborted_enqueue = true