Merge branch 'main' into kig/rails-8

fnf-org · Oct 3, 2024 · 9dccbe5 · 9dccbe5
2 parents b097bed + 8d80382
commit 9dccbe5
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,5 @@
 !/.env*.erb
 !/app/assets/builds/.keep
-!/log/.keep
 !/storage/.keep
 !/tmp/.keep
 !/tmp/pids/
@@ -28,7 +27,6 @@
 /config/master.key
 /coverage
 /doc
-/log/*
 /log/*.log
 /node_modules
 /public/assets

diff --git a/config/environments/test.rb b/config/environments/test.rb
@@ -83,6 +83,8 @@
   # Raise error when a before_action's only/except options reference missing actions
   config.action_controller.raise_on_missing_callback_actions = true
 
+  config.active_job.queue_adapter = :test
+
   config.stripe = {
     secret_api_key:      Rails.application.credentials.test.dig(:stripe, :secret_api_key),
     publishable_api_key: Rails.application.credentials.test.dig(:stripe, :publishable_api_key)

diff --git a/log/.gitkeep b/log/.gitkeep