Merge branch 'main' into remove-wedding-date

Merge pull request 'Fix tenant-related error retrieving captcha' (#168 ) from fix-tenant-captcha into main
Reviewed-on: #168
2024-12-07 22:17:30 +00:00 · 2024-12-07 22:03:18 +00:00 · 2024-12-07 22:53:30 +01:00 · 2024-12-07 19:29:38 +00:00 · 2024-12-07 20:27:28 +01:00 · 2024-12-07 19:02:30 +00:00
4 changed files with 15 additions and 8 deletions
--- a/2
+++ b/2
@ -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

--- a/Gemfile.lock
+++ b/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)
--- a/app/controllers/captcha_controller.rb
+++ b/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
--- a/config/database.yml
+++ b/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"] %>
Author	SHA1	Message	Date
bustikiller	c62bb137ce	Merge branch 'main' into remove-wedding-date Some checks failed Check usage of free licenses / check-licenses (pull_request) Successful in 38s Details Add copyright notice / copyright_notice (pull_request) Successful in 1m3s Details Run unit tests / unit_tests (pull_request) Failing after 2m51s Details	2024-12-07 22:17:30 +00:00
bustikiller	054561faa6	Merge pull request 'Fix tenant-related error retrieving captcha' (#168 ) from fix-tenant-captcha into main All checks were successful Check usage of free licenses / check-licenses (push) Successful in 55s Details Run unit tests / unit_tests (push) Successful in 3m2s Details Build Nginx-based docker image / build-static-assets (push) Successful in 25m30s Details Reviewed-on: #168	2024-12-07 22:03:18 +00:00
Manuel Bustillo	3996ffc85c	Fix tenant-related error retrieving captcha All checks were successful Check usage of free licenses / check-licenses (pull_request) Successful in 53s Details Add copyright notice / copyright_notice (pull_request) Successful in 1m37s Details Run unit tests / unit_tests (pull_request) Successful in 3m0s Details	2024-12-07 22:53:30 +01:00
bustikiller	82c543b167	Merge pull request 'Fix build of Docker image' (#167 ) from fix-build into main All checks were successful Check usage of free licenses / check-licenses (push) Successful in 1m4s Details Run unit tests / unit_tests (push) Successful in 2m24s Details Build Nginx-based docker image / build-static-assets (push) Successful in 22m41s Details Reviewed-on: #167	2024-12-07 19:29:38 +00:00
Manuel Bustillo	dfe914a0b8	Fix build of Docker image All checks were successful Check usage of free licenses / check-licenses (pull_request) Successful in 58s Details Add copyright notice / copyright_notice (pull_request) Successful in 1m17s Details Run unit tests / unit_tests (pull_request) Successful in 1m53s Details	2024-12-07 20:27:28 +01:00
bustikiller	0e234b34a0	Merge pull request 'Fix production DB host' (#166 ) from fix-prod-db-host into main Some checks failed Check usage of free licenses / check-licenses (push) Successful in 45s Details Run unit tests / unit_tests (push) Successful in 1m50s Details Build Nginx-based docker image / build-static-assets (push) Failing after 11m36s Details Reviewed-on: #166	2024-12-07 19:02:30 +00:00
Manuel Bustillo	2ab966faf8	Fix production DB host All checks were successful Check usage of free licenses / check-licenses (pull_request) Successful in 1m1s Details Add copyright notice / copyright_notice (pull_request) Successful in 1m23s Details Run unit tests / unit_tests (pull_request) Successful in 1m50s Details	2024-12-07 19:59:59 +01:00
Renovate Bot	2c4befbcf6	Update dependency solid_queue to v1.1.0 Some checks failed Add copyright notice / copyright_notice (pull_request) Successful in 5m15s Details Check usage of free licenses / check-licenses (pull_request) Successful in 4m58s Details Run unit tests / unit_tests (pull_request) Successful in 17m59s Details Check usage of free licenses / check-licenses (push) Successful in 9m24s Details Run unit tests / unit_tests (push) Successful in 6m19s Details Build Nginx-based docker image / build-static-assets (push) Failing after 57m5s Details	2024-12-07 01:06:02 +00:00