diff --git a/Gemfile b/Gemfile index 8f2a4f1c2e..c635a19249 100644 --- a/Gemfile +++ b/Gemfile @@ -3,7 +3,7 @@ source 'https://rubygems.org' ruby '3.4.9' -gem 'rails', '~> 8.1.2.1' +gem 'rails', '~> 8.1.3.1' gem 'pg', '~> 1.3.4' gem 'puma', '~> 6.6' gem 'bcrypt', '3.1.17' diff --git a/Gemfile.lock b/Gemfile.lock index 28d272e9f6..790bbf6e29 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -32,31 +32,31 @@ GEM concurrent-ruby (~> 1.0) action_policy (0.7.5) ruby-next-core (>= 1.0) - action_text-trix (2.1.17) + action_text-trix (2.1.19) railties - actioncable (8.1.2.1) - actionpack (= 8.1.2.1) - activesupport (= 8.1.2.1) + actioncable (8.1.3.1) + actionpack (= 8.1.3.1) + activesupport (= 8.1.3.1) nio4r (~> 2.0) websocket-driver (>= 0.6.1) zeitwerk (~> 2.6) - actionmailbox (8.1.2.1) - actionpack (= 8.1.2.1) - activejob (= 8.1.2.1) - activerecord (= 8.1.2.1) - activestorage (= 8.1.2.1) - activesupport (= 8.1.2.1) + actionmailbox (8.1.3.1) + actionpack (= 8.1.3.1) + activejob (= 8.1.3.1) + activerecord (= 8.1.3.1) + activestorage (= 8.1.3.1) + activesupport (= 8.1.3.1) mail (>= 2.8.0) - actionmailer (8.1.2.1) - actionpack (= 8.1.2.1) - actionview (= 8.1.2.1) - activejob (= 8.1.2.1) - activesupport (= 8.1.2.1) + actionmailer (8.1.3.1) + actionpack (= 8.1.3.1) + actionview (= 8.1.3.1) + activejob (= 8.1.3.1) + activesupport (= 8.1.3.1) mail (>= 2.8.0) rails-dom-testing (~> 2.2) - actionpack (8.1.2.1) - actionview (= 8.1.2.1) - activesupport (= 8.1.2.1) + actionpack (8.1.3.1) + actionview (= 8.1.3.1) + activesupport (= 8.1.3.1) nokogiri (>= 1.8.5) rack (>= 2.2.4) rack-session (>= 1.0.1) @@ -64,40 +64,40 @@ GEM rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) useragent (~> 0.16) - actiontext (8.1.2.1) + actiontext (8.1.3.1) action_text-trix (~> 2.1.15) - actionpack (= 8.1.2.1) - activerecord (= 8.1.2.1) - activestorage (= 8.1.2.1) - activesupport (= 8.1.2.1) + actionpack (= 8.1.3.1) + activerecord (= 8.1.3.1) + activestorage (= 8.1.3.1) + activesupport (= 8.1.3.1) globalid (>= 0.6.0) nokogiri (>= 1.8.5) - actionview (8.1.2.1) - activesupport (= 8.1.2.1) + actionview (8.1.3.1) + activesupport (= 8.1.3.1) builder (~> 3.1) erubi (~> 1.11) rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) active_record_distinct_on (1.10.0) activerecord (>= 6.1) - activejob (8.1.2.1) - activesupport (= 8.1.2.1) + activejob (8.1.3.1) + activesupport (= 8.1.3.1) globalid (>= 0.3.6) - activemodel (8.1.2.1) - activesupport (= 8.1.2.1) - activerecord (8.1.2.1) - activemodel (= 8.1.2.1) - activesupport (= 8.1.2.1) + activemodel (8.1.3.1) + activesupport (= 8.1.3.1) + activerecord (8.1.3.1) + activemodel (= 8.1.3.1) + activesupport (= 8.1.3.1) timeout (>= 0.4.0) activerecord_where_assoc (1.3.0) activerecord (>= 4.1.0) - activestorage (8.1.2.1) - actionpack (= 8.1.2.1) - activejob (= 8.1.2.1) - activerecord (= 8.1.2.1) - activesupport (= 8.1.2.1) + activestorage (8.1.3.1) + actionpack (= 8.1.3.1) + activejob (= 8.1.3.1) + activerecord (= 8.1.3.1) + activesupport (= 8.1.3.1) marcel (~> 1.0) - activesupport (8.1.2.1) + activesupport (8.1.3.1) base64 bigdecimal concurrent-ruby (~> 1.0, >= 1.3.1) @@ -151,12 +151,12 @@ GEM regexp_parser (>= 1.5, < 3.0) xpath (~> 3.2) compact_index (0.15.0) - concurrent-ruby (1.3.5) - connection_pool (2.5.4) + concurrent-ruby (1.3.8) + connection_pool (3.0.2) crack (1.0.0) bigdecimal rexml - crass (1.0.6) + crass (1.0.7) cronitor (5.3.0) httparty csv (3.3.0) @@ -198,7 +198,7 @@ GEM activerecord (>= 5.a) database_cleaner-core (~> 2.0) database_cleaner-core (2.0.1) - date (3.5.0) + date (3.5.1) diff-lcs (1.5.0) dotenv (2.7.6) dotenv-rails (2.7.6) @@ -223,7 +223,7 @@ GEM fugit (1.9.0) et-orbi (~> 1, >= 1.2.7) raabro (~> 1.4) - globalid (1.3.0) + globalid (1.4.0) activesupport (>= 6.1) haikunator (1.1.1) has_scope (0.8.0) @@ -234,11 +234,12 @@ GEM csv mini_mime (>= 1.0.0) multi_xml (>= 0.5.2) - i18n (1.14.7) + i18n (1.15.2) concurrent-ruby (~> 1.0) - io-console (0.8.1) - irb (1.15.3) + io-console (0.8.2) + irb (1.18.0) pp (>= 0.6.0) + prism (>= 1.3.0) rdoc (>= 4.0.0) reline (>= 0.4.2) jmespath (1.6.1) @@ -284,29 +285,31 @@ GEM activesupport (>= 4) railties (>= 4) request_store (~> 1.0) - loofah (2.24.1) + loofah (2.25.2) crass (~> 1.0.2) nokogiri (>= 1.12.0) - mail (2.9.0) + mail (2.9.1) logger mini_mime (>= 0.1.1) net-imap net-pop net-smtp - marcel (1.1.0) + marcel (1.2.1) matrix (0.4.3) memoist3 (1.0.0) memory_profiler (1.1.0) mini_mime (1.1.5) mini_portile2 (2.8.9) minitar (1.0.2) - minitest (5.26.0) + minitest (6.0.6) + drb (~> 2.0) + prism (~> 1.5) msgpack (1.7.2) multi_json (1.15.0) multi_test (1.1.0) multi_xml (0.7.1) bigdecimal (~> 3.1) - net-imap (0.5.12) + net-imap (0.6.6) date net-protocol net-pop (0.1.2) @@ -330,12 +333,10 @@ GEM parallel_tests (5.5.0) parallel pg (1.3.4) - pp (0.6.3) + pp (0.6.4) prettyprint prettyprint (0.2.0) - psych (5.2.6) - date - stringio + prism (1.9.0) public_suffix (4.0.6) puma (6.6.0) nio4r (~> 2.0) @@ -354,52 +355,57 @@ GEM rackup (1.0.1) rack (< 3) webrick - rails (8.1.2.1) - actioncable (= 8.1.2.1) - actionmailbox (= 8.1.2.1) - actionmailer (= 8.1.2.1) - actionpack (= 8.1.2.1) - actiontext (= 8.1.2.1) - actionview (= 8.1.2.1) - activejob (= 8.1.2.1) - activemodel (= 8.1.2.1) - activerecord (= 8.1.2.1) - activestorage (= 8.1.2.1) - activesupport (= 8.1.2.1) + rails (8.1.3.1) + actioncable (= 8.1.3.1) + actionmailbox (= 8.1.3.1) + actionmailer (= 8.1.3.1) + actionpack (= 8.1.3.1) + actiontext (= 8.1.3.1) + actionview (= 8.1.3.1) + activejob (= 8.1.3.1) + activemodel (= 8.1.3.1) + activerecord (= 8.1.3.1) + activestorage (= 8.1.3.1) + activesupport (= 8.1.3.1) bundler (>= 1.15.0) - railties (= 8.1.2.1) + railties (= 8.1.3.1) rails-dom-testing (2.3.0) activesupport (>= 5.0.0) minitest nokogiri (>= 1.6) - rails-html-sanitizer (1.6.2) - loofah (~> 2.21) + rails-html-sanitizer (1.7.1) + loofah (~> 2.25, >= 2.25.2) nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0) rails-pattern_matching (0.2.0) activemodel activerecord - railties (8.1.2.1) - actionpack (= 8.1.2.1) - activesupport (= 8.1.2.1) + railties (8.1.3.1) + actionpack (= 8.1.3.1) + activesupport (= 8.1.3.1) irb (~> 1.13) rackup (>= 1.0.0) rake (>= 12.2) thor (~> 1.0, >= 1.2.2) tsort (>= 0.2) zeitwerk (~> 2.6) - rake (13.3.1) + rake (13.4.2) rb-fsevent (0.11.2) rb-inotify (0.10.1) ffi (~> 1.0) - rdoc (6.15.1) + rbs (4.1.0) + logger + prism (>= 1.6.0) + tsort + rdoc (8.0.0) erb - psych (>= 4.0.0) + prism (>= 1.6.0) + rbs (>= 4.0.0) tsort redis (4.7.1) redis-client (0.26.1) connection_pool regexp_parser (2.11.3) - reline (0.6.2) + reline (0.6.3) io-console (~> 0.5) request_migrations (1.1.2) rails (>= 6.0) @@ -460,7 +466,6 @@ GEM statement_timeout (1.1.0) rails (>= 6.0) statsd-ruby (1.5.0) - stringio (3.1.7) stripe (5.48.0) strong_migrations (2.5.0) activerecord (>= 7.1) @@ -469,9 +474,9 @@ GEM memoist3 (~> 1.0.0) temporary_tables (1.0.0) activerecord (>= 6.0) - thor (1.4.0) + thor (1.5.0) timecop (0.9.5) - timeout (0.4.4) + timeout (0.6.1) tracer (0.1.1) tsort (0.2.0) typed_params (1.5.0) @@ -489,8 +494,8 @@ GEM addressable (>= 2.8.0) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) - webrick (1.9.1) - websocket-driver (0.8.0) + webrick (1.9.2) + websocket-driver (0.8.2) base64 websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) @@ -499,7 +504,7 @@ GEM jwt (~> 2.8) xpath (3.2.0) nokogiri (~> 1.8) - zeitwerk (2.7.3) + zeitwerk (2.8.2) PLATFORMS ruby @@ -557,7 +562,7 @@ DEPENDENCIES rack-attack (~> 6.6) rack-cors rack-timeout (~> 0.7) - rails (~> 8.1.2.1) + rails (~> 8.1.3.1) rails-pattern_matching redis (~> 4.7.1) request_migrations (~> 1.1.2) diff --git a/config/initializers/zietwork.rb b/config/initializers/zeitwerk.rb similarity index 87% rename from config/initializers/zietwork.rb rename to config/initializers/zeitwerk.rb index 9157e6dbd9..f3c49f89e5 100644 --- a/config/initializers/zietwork.rb +++ b/config/initializers/zeitwerk.rb @@ -11,6 +11,8 @@ autoloader.do_not_eager_load( Rails.root.join('app/models/clickhouse_record.rb'), Rails.root.join('app/models/clickhouse'), + # FIXME(ezekg) https://github.com/fxn/zeitwerk/issues/337 + *Rails.root.glob('app/models/clickhouse/**/*'), ) end