Merge branch 'main' into remove-wedding-date

Gemfile

@@ -22,6 +22,7 @@ gem 'react-rails'
 gem 'rubytree'
 gem 'acts_as_tenant'
 gem 'httparty'
+gem 'rswag'
 
 group :development, :test do
   gem 'annotaterb'
@@ -30,7 +31,6 @@ group :development, :test do
   gem 'license_finder'
   gem 'pry'
   gem 'rspec-rails', '~> 7.1.0'
-  gem 'rswag'
   gem 'shoulda-matchers', '~> 6.0'
 end
 

Gemfile.lock

@@ -98,7 +98,7 @@ GEM
     connection_pool (2.4.1)
     crass (1.0.6)
     csv (3.3.0)
-    date (3.4.0)
+    date (3.4.1)
     debug (1.9.2)
       irb (~> 1.10)
       reline (>= 0.3.8)
@@ -136,7 +136,7 @@ GEM
       actionpack (>= 6.0.0)
       activesupport (>= 6.0.0)
       railties (>= 6.0.0)
-    io-console (0.7.2)
+    io-console (0.8.0)
     irb (1.14.1)
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
@@ -188,7 +188,7 @@ GEM
     marcel (1.0.4)
     method_source (1.1.0)
     mini_mime (1.1.5)
-    minitest (5.25.2)
+    minitest (5.25.4)
     money (6.19.0)
       i18n (>= 0.6.4, <= 2)
     msgpack (1.7.2)
@@ -273,7 +273,7 @@ GEM
       zeitwerk (~> 2.6)
     rainbow (3.1.1)
     rake (13.2.1)
-    rdoc (6.7.0)
+    rdoc (6.8.1)
       psych (>= 4.0.0)
     react-rails (3.2.1)
       babel-transpiler (>= 0.7.0)
@@ -340,10 +340,10 @@ GEM
     rubytree (2.1.0)
       json (~> 2.0, > 2.3.1)
     rubyzip (2.3.2)
-    securerandom (0.3.2)
+    securerandom (0.4.0)
     shoulda-matchers (6.4.0)
       activesupport (>= 5.2.0)
-    solid_queue (1.0.2)
+    solid_queue (1.1.0)
       activejob (>= 7.1)
       activerecord (>= 7.1)
       concurrent-ruby (>= 1.3.1)
@@ -371,7 +371,7 @@ GEM
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.6.0)
     uri (1.0.2)
-    useragent (0.16.10)
+    useragent (0.16.11)
     warden (1.2.9)
       rack (>= 2.0.9)
     web-console (4.2.1)

app/controllers/captcha_controller.rb

@@ -10,4 +10,10 @@ class CaptchaController < ApplicationController
       media_url: media_captcha_index_url(id:)
     }, status: :created
   end
+
+  private
+
+  def set_tenant
+    ActsAsTenant.current_tenant = nil
+  end
 end

config/database.yml

@@ -83,6 +83,7 @@ test:
 #
 production:
   <<: *default
+  host: db
   database: wedding_planner_production
   username: wedding_planner
   password: <%= ENV["WEDDING_PLANNER_DATABASE_PASSWORD"] %>