From 75811c37a9c1cc7d6977cd841437d136d4b95440 Mon Sep 17 00:00:00 2001
From: BatedUrGonnaDie <batedurgonnadie@yahoo.com>
Date: Tue, 9 Apr 2019 00:35:16 -0700
Subject: Only override async adapter when seeding

---
 railties/lib/rails/engine.rb | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'railties/lib/rails/engine.rb')

diff --git a/railties/lib/rails/engine.rb b/railties/lib/rails/engine.rb
index 778bbebe75..eb2f0e8fca 100644
--- a/railties/lib/rails/engine.rb
+++ b/railties/lib/rails/engine.rb
@@ -550,7 +550,13 @@ module Rails
     # Blog::Engine.load_seed
     def load_seed
       seed_file = paths["db/seeds.rb"].existent.first
-      with_inline_jobs { load(seed_file) } if seed_file
+      return unless seed_file
+
+      if config.active_job.queue_adapter == :async
+        with_inline_jobs { load(seed_file) }
+      else
+        load(seed_file)
+      end
     end
 
     # Add configured load paths to Ruby's load path, and remove duplicate entries.
-- 
cgit v1.2.3