Merge branch 'main' into feature/wardrobe-v2

This commit is contained in:
Emi Matchu 2025-12-26 21:23:33 -08:00
commit 02a64ef639
9 changed files with 12 additions and 16 deletions

View file

@ -18,7 +18,6 @@ gem 'sprockets', '~> 4.2'
gem 'haml', '~> 6.1', '>= 6.1.1' gem 'haml', '~> 6.1', '>= 6.1.1'
gem 'sass-rails', '~> 6.0' gem 'sass-rails', '~> 6.0'
gem 'terser', '~> 1.1', '>= 1.1.17' gem 'terser', '~> 1.1', '>= 1.1.17'
gem 'react-rails', '~> 2.7', '>= 2.7.1'
gem 'jsbundling-rails', '~> 1.3' gem 'jsbundling-rails', '~> 1.3'
gem 'turbo-rails', '~> 2.0' gem 'turbo-rails', '~> 2.0'

View file

@ -111,10 +111,6 @@ GEM
async-container (~> 0.16) async-container (~> 0.16)
string-format (~> 0.2) string-format (~> 0.2)
attr_required (1.0.2) attr_required (1.0.2)
babel-source (5.8.35)
babel-transpiler (0.7.0)
babel-source (>= 4.0, < 6)
execjs (~> 2.0)
backport (1.2.0) backport (1.2.0)
base64 (0.3.0) base64 (0.3.0)
bcrypt (3.1.20) bcrypt (3.1.20)
@ -183,6 +179,9 @@ GEM
faraday-net_http (3.4.2) faraday-net_http (3.4.2)
net-http (~> 0.5) net-http (~> 0.5)
ffi (1.17.2) ffi (1.17.2)
ffi (1.17.2-aarch64-linux-gnu)
ffi (1.17.2-arm64-darwin)
ffi (1.17.2-x86_64-linux-gnu)
fiber-annotation (0.2.0) fiber-annotation (0.2.0)
fiber-local (1.1.0) fiber-local (1.1.0)
fiber-storage fiber-storage
@ -267,6 +266,12 @@ GEM
nokogiri (1.18.10) nokogiri (1.18.10)
mini_portile2 (~> 2.8.2) mini_portile2 (~> 2.8.2)
racc (~> 1.4) racc (~> 1.4)
nokogiri (1.18.10-aarch64-linux-gnu)
racc (~> 1.4)
nokogiri (1.18.10-arm64-darwin)
racc (~> 1.4)
nokogiri (1.18.10-x86_64-linux-gnu)
racc (~> 1.4)
omniauth (2.1.4) omniauth (2.1.4)
hashie (>= 3.4.6) hashie (>= 3.4.6)
logger logger
@ -385,12 +390,6 @@ GEM
erb erb
psych (>= 4.0.0) psych (>= 4.0.0)
tsort tsort
react-rails (2.7.1)
babel-transpiler (>= 0.7.0)
connection_pool
execjs
railties (>= 3.2)
tilt
regexp_parser (2.11.3) regexp_parser (2.11.3)
reline (0.6.3) reline (0.6.3)
io-console (~> 0.5) io-console (~> 0.5)
@ -540,7 +539,10 @@ GEM
zeitwerk (2.7.4) zeitwerk (2.7.4)
PLATFORMS PLATFORMS
aarch64-linux
arm64-darwin
ruby ruby
x86_64-linux
DEPENDENCIES DEPENDENCIES
RocketAMF! RocketAMF!
@ -568,7 +570,6 @@ DEPENDENCIES
rails (~> 8.0, >= 8.0.1) rails (~> 8.0, >= 8.0.1)
rails-i18n (~> 8.0, >= 8.0.1) rails-i18n (~> 8.0, >= 8.0.1)
rdiscount (~> 2.2, >= 2.2.7.1) rdiscount (~> 2.2, >= 2.2.7.1)
react-rails (~> 2.7, >= 2.7.1)
rspec-rails (~> 7.0) rspec-rails (~> 7.0)
sanitize (~> 6.0, >= 6.0.2) sanitize (~> 6.0, >= 6.0.2)
sass-rails (~> 6.0) sass-rails (~> 6.0)

View file

@ -56,8 +56,6 @@ Rails.application.configure do
# Highlight code that enqueued background job in logs. # Highlight code that enqueued background job in logs.
config.active_job.verbose_enqueue_logs = true config.active_job.verbose_enqueue_logs = true
config.react.variant = :development
# Highlight code that triggered redirect in logs. # Highlight code that triggered redirect in logs.
config.action_dispatch.verbose_redirect_logs = true config.action_dispatch.verbose_redirect_logs = true

View file

@ -34,8 +34,6 @@ Rails.application.configure do
config.log_tags = [ :request_id ] config.log_tags = [ :request_id ]
config.logger = ActiveSupport::TaggedLogging.logger(STDOUT) config.logger = ActiveSupport::TaggedLogging.logger(STDOUT)
config.react.variant = :production
# Change to "debug" to log everything (including potentially personally-identifiable information!). # Change to "debug" to log everything (including potentially personally-identifiable information!).
config.log_level = ENV.fetch("RAILS_LOG_LEVEL", "info") config.log_level = ENV.fetch("RAILS_LOG_LEVEL", "info")

Binary file not shown.

Binary file not shown.

BIN
vendor/cache/ffi-1.17.2.gem vendored Normal file

Binary file not shown.

BIN
vendor/cache/nokogiri-1.18.10.gem vendored Normal file

Binary file not shown.

Binary file not shown.