From 298f54f63045db2e7b246c5207926fbd7973a126 Mon Sep 17 00:00:00 2001 From: Martin Hinz Date: Fri, 13 Dec 2024 16:46:34 +0100 Subject: [PATCH 1/9] updated gems --- Gemfile | 2 +- Gemfile.lock | 370 ++++++++++++++++++++++++++++----------------------- 2 files changed, 208 insertions(+), 164 deletions(-) diff --git a/Gemfile b/Gemfile index cee5baa4..5e40f2a4 100644 --- a/Gemfile +++ b/Gemfile @@ -6,7 +6,7 @@ git_source(:github) { |repo| 'https://github.com/#{repo}.git' } # Ruby on Rails ruby '3.0.4' -gem 'rails', '~> 7.0.0' +gem 'rails', '~> 7.1.0' # Database for Active Record gem 'pg' diff --git a/Gemfile.lock b/Gemfile.lock index ac42c177..7fcee04b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,59 +1,64 @@ GEM remote: https://rubygems.org/ specs: - actioncable (7.0.8.4) - actionpack (= 7.0.8.4) - activesupport (= 7.0.8.4) + actioncable (7.1.5.1) + actionpack (= 7.1.5.1) + activesupport (= 7.1.5.1) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (7.0.8.4) - actionpack (= 7.0.8.4) - activejob (= 7.0.8.4) - activerecord (= 7.0.8.4) - activestorage (= 7.0.8.4) - activesupport (= 7.0.8.4) + zeitwerk (~> 2.6) + actionmailbox (7.1.5.1) + actionpack (= 7.1.5.1) + activejob (= 7.1.5.1) + activerecord (= 7.1.5.1) + activestorage (= 7.1.5.1) + activesupport (= 7.1.5.1) mail (>= 2.7.1) net-imap net-pop net-smtp - actionmailer (7.0.8.4) - actionpack (= 7.0.8.4) - actionview (= 7.0.8.4) - activejob (= 7.0.8.4) - activesupport (= 7.0.8.4) + actionmailer (7.1.5.1) + actionpack (= 7.1.5.1) + actionview (= 7.1.5.1) + activejob (= 7.1.5.1) + activesupport (= 7.1.5.1) mail (~> 2.5, >= 2.5.4) net-imap net-pop net-smtp - rails-dom-testing (~> 2.0) - actionpack (7.0.8.4) - actionview (= 7.0.8.4) - activesupport (= 7.0.8.4) - rack (~> 2.0, >= 2.2.4) + rails-dom-testing (~> 2.2) + actionpack (7.1.5.1) + actionview (= 7.1.5.1) + activesupport (= 7.1.5.1) + nokogiri (>= 1.8.5) + racc + rack (>= 2.2.4) + rack-session (>= 1.0.1) rack-test (>= 0.6.3) - rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (7.0.8.4) - actionpack (= 7.0.8.4) - activerecord (= 7.0.8.4) - activestorage (= 7.0.8.4) - activesupport (= 7.0.8.4) + rails-dom-testing (~> 2.2) + rails-html-sanitizer (~> 1.6) + actiontext (7.1.5.1) + actionpack (= 7.1.5.1) + activerecord (= 7.1.5.1) + activestorage (= 7.1.5.1) + activesupport (= 7.1.5.1) globalid (>= 0.6.0) nokogiri (>= 1.8.5) - actionview (7.0.8.4) - activesupport (= 7.0.8.4) + actionview (7.1.5.1) + activesupport (= 7.1.5.1) builder (~> 3.1) - erubi (~> 1.4) - rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.1, >= 1.2.0) - activejob (7.0.8.4) - activesupport (= 7.0.8.4) + erubi (~> 1.11) + rails-dom-testing (~> 2.2) + rails-html-sanitizer (~> 1.6) + activejob (7.1.5.1) + activesupport (= 7.1.5.1) globalid (>= 0.3.6) - activemodel (7.0.8.4) - activesupport (= 7.0.8.4) - activerecord (7.0.8.4) - activemodel (= 7.0.8.4) - activesupport (= 7.0.8.4) + activemodel (7.1.5.1) + activesupport (= 7.1.5.1) + activerecord (7.1.5.1) + activemodel (= 7.1.5.1) + activesupport (= 7.1.5.1) + timeout (>= 0.4.0) activerecord-session_store (2.1.0) actionpack (>= 6.1) activerecord (>= 6.1) @@ -61,26 +66,34 @@ GEM multi_json (~> 1.11, >= 1.11.2) rack (>= 2.0.8, < 4) railties (>= 6.1) - activestorage (7.0.8.4) - actionpack (= 7.0.8.4) - activejob (= 7.0.8.4) - activerecord (= 7.0.8.4) - activesupport (= 7.0.8.4) + activestorage (7.1.5.1) + actionpack (= 7.1.5.1) + activejob (= 7.1.5.1) + activerecord (= 7.1.5.1) + activesupport (= 7.1.5.1) marcel (~> 1.0) - mini_mime (>= 1.1.0) - activesupport (7.0.8.4) + activesupport (7.1.5.1) + base64 + benchmark (>= 0.3) + bigdecimal concurrent-ruby (~> 1.0, >= 1.0.2) + connection_pool (>= 2.2.5) + drb i18n (>= 1.6, < 2) + logger (>= 1.4.2) minitest (>= 5.1) + mutex_m + securerandom (>= 0.3) tzinfo (~> 2.0) - addressable (2.8.6) - public_suffix (>= 2.0.2, < 6.0) + addressable (2.8.7) + public_suffix (>= 2.0.2, < 7.0) annotate (3.2.0) activerecord (>= 3.2, < 8.0) rake (>= 10.4, < 14.0) ast (2.4.2) base64 (0.2.0) bcrypt (3.1.20) + benchmark (0.4.0) bibtex-ruby (6.1.0) latex-decode (~> 0.0) racc (~> 1.7) @@ -93,9 +106,9 @@ GEM actionview activesupport i18n - brotli (0.5.0) + brotli (0.6.0) builder (3.3.0) - bullet (7.1.6) + bullet (8.0.0) activesupport (>= 3.0.0) uniform_notifier (~> 1.11) byebug (11.1.3) @@ -121,15 +134,18 @@ GEM mini_mime (>= 0.1.3) ssrf_filter (~> 1.0) cgi (0.4.1) - childprocess (5.0.0) + childprocess (5.1.0) + logger (~> 1.5) chronic (0.10.2) citeproc (1.0.10) namae (~> 1.0) - citeproc-ruby (2.0.0) + citeproc-ruby (2.1.0) citeproc (~> 1.0, >= 1.0.9) csl (~> 2.0) + observer (< 1.0) coderay (1.1.3) - concurrent-ruby (1.3.3) + concurrent-ruby (1.3.4) + connection_pool (2.4.1) countries (6.0.1) unaccent (~> 0.3) country_select (9.0.0) @@ -140,10 +156,10 @@ GEM rexml csl-styles (2.0.1) csl (~> 2.0) - cssbundling-rails (1.4.0) + cssbundling-rails (1.4.1) railties (>= 6.0.0) csv (3.3.0) - date (3.3.4) + date (3.4.1) devise (4.9.4) bcrypt (~> 3.0) orm_adapter (~> 0.1) @@ -151,38 +167,41 @@ GEM responders warden (~> 1.2.3) diff-lcs (1.5.1) - docile (1.4.0) - doorkeeper (5.7.0) + docile (1.4.1) + doorkeeper (5.8.1) railties (>= 5) - dotenv (3.1.2) - dotenv-rails (3.1.2) - dotenv (= 3.1.2) + dotenv (3.1.6) + dotenv-rails (3.1.6) + dotenv (= 3.1.6) railties (>= 6.1) - erubi (1.12.0) - execjs (2.9.1) - factory_bot (6.4.6) + drb (2.2.1) + erubi (1.13.0) + execjs (2.10.0) + factory_bot (6.5.0) activesupport (>= 5.0.0) - factory_bot_rails (6.4.3) - factory_bot (~> 6.4) + factory_bot_rails (6.4.4) + factory_bot (~> 6.5) railties (>= 5.0.0) - faker (3.4.1) + faker (3.5.1) i18n (>= 1.8.11, < 2) - faraday (2.9.1) - faraday-net_http (>= 2.0, < 3.2) - faraday-net_http (3.1.0) - net-http + faraday (2.12.2) + faraday-net_http (>= 2.0, < 3.5) + json + logger + faraday-net_http (3.4.0) + net-http (>= 0.5.0) feedjira (3.2.3) loofah (>= 2.3.1, < 3) sax-machine (>= 1.0, < 2) ffi (1.17.0) formatador (1.1.0) gbifrb (0.2.0) - geocoder (1.8.3) + geocoder (1.8.4) base64 (>= 0.1.0) csv (>= 3.0.0) globalid (1.2.1) activesupport (>= 6.1) - guard (2.18.1) + guard (2.19.0) formatador (>= 0.2.4) listen (>= 2.7, < 4.0) lumberjack (>= 1.0.12, < 2.0) @@ -200,35 +219,41 @@ GEM csv mini_mime (>= 1.0.0) multi_xml (>= 0.5.2) - i18n (1.14.5) + i18n (1.14.6) concurrent-ruby (~> 1.0) - i18n_data (0.17.1) + i18n_data (1.1.0) simple_po_parser (~> 1.1) - image_processing (1.12.2) + image_processing (1.13.0) mini_magick (>= 4.9.5, < 5) ruby-vips (>= 2.0.17, < 3) - jbuilder (2.12.0) + io-console (0.8.0) + irb (1.14.2) + rdoc (>= 4.0.0) + reline (>= 0.4.2) + jbuilder (2.13.0) actionview (>= 5.0.0) activesupport (>= 5.0.0) - jsbundling-rails (1.3.0) + jsbundling-rails (1.3.1) railties (>= 6.0.0) - json (2.7.2) - json-schema (4.3.0) - addressable (>= 2.8) - kramdown (2.4.0) - rexml + json (2.9.0) + json-schema (5.1.1) + addressable (~> 2.8) + bigdecimal (~> 3.1) + kramdown (2.5.1) + rexml (>= 3.3.9) language_server-protocol (3.17.0.3) latex-decode (0.4.0) launchy (3.0.1) addressable (~> 2.8) childprocess (~> 5.0) - leaflet-rails (1.9.4) + leaflet-rails (1.9.5) actionpack (>= 4.2.0) railties (>= 4.2.0) listen (3.9.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) - loofah (2.22.0) + logger (1.6.3) + loofah (2.23.1) crass (~> 1.0.2) nokogiri (>= 1.12.0) lumberjack (1.2.10) @@ -240,17 +265,18 @@ GEM marcel (1.0.4) matrix (0.4.2) method_source (1.1.0) - mini_magick (4.12.0) + mini_magick (4.13.2) mini_mime (1.1.5) - minitest (5.23.1) + minitest (5.25.4) multi_json (1.15.0) multi_xml (0.6.0) + mutex_m (0.3.0) namae (1.2.0) racc (~> 1.7) nenv (0.3.0) - net-http (0.4.1) + net-http (0.6.0) uri - net-imap (0.4.12) + net-imap (0.4.18) date net-protocol net-pop (0.1.2) @@ -259,104 +285,119 @@ GEM timeout net-smtp (0.5.0) net-protocol - nio4r (2.7.3) - nokogiri (1.16.5-arm64-darwin) + nio4r (2.7.4) + nokogiri (1.17.2-arm64-darwin) racc (~> 1.4) - nokogiri (1.16.5-x86_64-darwin) + nokogiri (1.17.2-x86_64-darwin) racc (~> 1.4) - nokogiri (1.16.5-x86_64-linux) + nokogiri (1.17.2-x86_64-linux) racc (~> 1.4) notiffany (0.1.3) nenv (~> 0.1) shellany (~> 0.0) - oj (3.16.4) + observer (0.1.2) + oj (3.16.7) bigdecimal (>= 3.0) + ostruct (>= 0.2) orm_adapter (0.5.0) + ostruct (0.6.1) pagy (6.5.0) - paper_trail (15.1.0) + paper_trail (16.0.0) activerecord (>= 6.1) request_store (~> 1.4) - parallel (1.25.1) - parser (3.3.3.0) + parallel (1.26.3) + parser (3.3.6.0) ast (~> 2.4.1) racc - pg (1.5.6) - pg_search (2.3.6) - activerecord (>= 5.2) - activesupport (>= 5.2) - postgres-copy (1.7.1) + pg (1.5.9) + pg_search (2.3.7) + activerecord (>= 6.1) + activesupport (>= 6.1) + postgres-copy (1.7.2) activerecord (>= 5.1) + csv pg (>= 0.17) - propshaft (0.9.0) + propshaft (1.1.0) actionpack (>= 7.0.0) activesupport (>= 7.0.0) rack railties (>= 7.0.0) - pry (0.14.2) + pry (0.15.0) coderay (~> 1.1) method_source (~> 1.0) - public_suffix (5.0.5) - puma (6.4.2) + psych (5.2.1) + date + stringio + public_suffix (6.0.1) + puma (6.5.0) nio4r (~> 2.0) - racc (1.8.0) - rack (2.2.9) - rack-brotli (1.2.0) - brotli (>= 0.1.7) - rack (>= 1.4) + racc (1.8.1) + rack (3.1.8) + rack-brotli (2.0.0) + brotli (>= 0.3) + rack (>= 3) + rack-session (2.0.0) + rack (>= 3.0.0) rack-test (2.1.0) rack (>= 1.3) - rails (7.0.8.4) - actioncable (= 7.0.8.4) - actionmailbox (= 7.0.8.4) - actionmailer (= 7.0.8.4) - actionpack (= 7.0.8.4) - actiontext (= 7.0.8.4) - actionview (= 7.0.8.4) - activejob (= 7.0.8.4) - activemodel (= 7.0.8.4) - activerecord (= 7.0.8.4) - activestorage (= 7.0.8.4) - activesupport (= 7.0.8.4) + rackup (2.2.1) + rack (>= 3) + rails (7.1.5.1) + actioncable (= 7.1.5.1) + actionmailbox (= 7.1.5.1) + actionmailer (= 7.1.5.1) + actionpack (= 7.1.5.1) + actiontext (= 7.1.5.1) + actionview (= 7.1.5.1) + activejob (= 7.1.5.1) + activemodel (= 7.1.5.1) + activerecord (= 7.1.5.1) + activestorage (= 7.1.5.1) + activesupport (= 7.1.5.1) bundler (>= 1.15.0) - railties (= 7.0.8.4) + railties (= 7.1.5.1) rails-dom-testing (2.2.0) activesupport (>= 5.0.0) minitest nokogiri (>= 1.6) - rails-html-sanitizer (1.6.0) + rails-html-sanitizer (1.6.2) loofah (~> 2.21) - nokogiri (~> 1.14) - railties (7.0.8.4) - actionpack (= 7.0.8.4) - activesupport (= 7.0.8.4) - method_source + 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) + railties (7.1.5.1) + actionpack (= 7.1.5.1) + activesupport (= 7.1.5.1) + irb + rackup (>= 1.0.0) rake (>= 12.2) - thor (~> 1.0) - zeitwerk (~> 2.5) + thor (~> 1.0, >= 1.2.2) + zeitwerk (~> 2.6) rainbow (3.1.1) rake (13.2.1) rb-fsevent (0.11.2) rb-inotify (0.11.1) ffi (~> 1.0) + rdoc (6.8.1) + psych (>= 4.0.0) redis (4.8.1) - regexp_parser (2.9.2) + regexp_parser (2.9.3) + reline (0.5.12) + io-console (~> 0.5) request_store (1.7.0) rack (>= 1.4) responders (3.1.1) actionpack (>= 5.2) railties (>= 5.2) - rexml (3.3.0) - strscan + rexml (3.3.9) rspec (3.13.0) rspec-core (~> 3.13.0) rspec-expectations (~> 3.13.0) rspec-mocks (~> 3.13.0) - rspec-core (3.13.0) + rspec-core (3.13.2) rspec-support (~> 3.13.0) - rspec-expectations (3.13.0) + rspec-expectations (3.13.3) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.13.0) - rspec-mocks (3.13.1) + rspec-mocks (3.13.2) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.13.0) rspec-rails (4.0.2) @@ -367,35 +408,37 @@ GEM rspec-expectations (~> 3.10) rspec-mocks (~> 3.10) rspec-support (~> 3.10) - rspec-support (3.13.1) - rubocop (1.64.1) + rspec-support (3.13.2) + rubocop (1.69.2) json (~> 2.3) language_server-protocol (>= 3.17.0) parallel (~> 1.10) parser (>= 3.3.0.2) rainbow (>= 2.2.2, < 4.0) - regexp_parser (>= 1.8, < 3.0) - rexml (>= 3.2.5, < 4.0) - rubocop-ast (>= 1.31.1, < 2.0) + regexp_parser (>= 2.9.3, < 3.0) + rubocop-ast (>= 1.36.2, < 2.0) ruby-progressbar (~> 1.7) - unicode-display_width (>= 2.4.0, < 3.0) - rubocop-ast (1.31.3) + unicode-display_width (>= 2.4.0, < 4.0) + rubocop-ast (1.37.0) parser (>= 3.3.1.0) - rubocop-rails (2.25.0) + rubocop-rails (2.27.0) activesupport (>= 4.2.0) rack (>= 1.1) - rubocop (>= 1.33.0, < 2.0) + rubocop (>= 1.52.0, < 2.0) rubocop-ast (>= 1.31.1, < 2.0) ruby-progressbar (1.13.0) - ruby-vips (2.2.1) + ruby-vips (2.2.2) ffi (~> 1.12) + logger rubyzip (2.3.2) sax-machine (1.3.2) scenic (1.8.0) activerecord (>= 4.0.0) railties (>= 4.0.0) - selenium-webdriver (4.21.1) + securerandom (0.3.2) + selenium-webdriver (4.26.0) base64 (~> 0.2) + logger (~> 1.4) rexml (~> 3.2, >= 3.2.5) rubyzip (>= 1.2.2, < 3.0) websocket (~> 1.0) @@ -408,7 +451,7 @@ GEM simplecov-cobertura (2.1.0) rexml simplecov (~> 0.19) - simplecov-html (0.12.3) + simplecov-html (0.13.1) simplecov_json_formatter (0.1.4) sitemap_generator (6.3.0) builder (~> 3.0) @@ -416,28 +459,29 @@ GEM spring-watcher-listen (2.1.0) listen (>= 2.7, < 4.0) spring (>= 4) - ssrf_filter (1.1.2) - stimulus-rails (1.3.3) + ssrf_filter (1.2.0) + stimulus-rails (1.3.4) railties (>= 6.0.0) - strscan (3.1.0) - thor (1.3.1) - timeout (0.4.1) - turbo-rails (2.0.5) + stringio (3.1.2) + thor (1.3.2) + timeout (0.4.2) + turbo-rails (2.0.11) actionpack (>= 6.0.0) - activejob (>= 6.0.0) railties (>= 6.0.0) tzinfo (2.0.6) concurrent-ruby (~> 1.0) - uglifier (4.2.0) + uglifier (4.2.1) execjs (>= 0.3.0, < 3) unaccent (0.4.0) - unicode-display_width (2.5.0) + unicode-display_width (3.1.2) + unicode-emoji (~> 4.0, >= 4.0.4) + unicode-emoji (4.0.4) uniform_notifier (1.16.0) - uri (0.13.0) + uri (1.0.2) validate_url (1.0.15) activemodel (>= 3.0.0) public_suffix - vega (0.3.1) + vega (0.3.2) warden (1.2.9) rack (>= 2.0.9) web-console (4.2.1) @@ -445,7 +489,7 @@ GEM activemodel (>= 6.0.0) bindex (>= 0.4.0) railties (>= 6.0.0) - websocket (1.2.10) + websocket (1.2.11) websocket-driver (0.7.6) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) @@ -453,7 +497,7 @@ GEM chronic (>= 0.6.3) xpath (3.2.0) nokogiri (~> 1.8) - zeitwerk (2.6.15) + zeitwerk (2.6.18) PLATFORMS arm64-darwin-23 @@ -506,7 +550,7 @@ DEPENDENCIES propshaft (>= 0.6.2) puma rack-brotli - rails (~> 7.0.0) + rails (~> 7.1.0) redis (~> 4.0) rspec-rails (~> 4.0.1) rubocop @@ -532,4 +576,4 @@ RUBY VERSION ruby 3.0.4p208 BUNDLED WITH - 2.2.33 + 2.5.1 From e8c07472dc0d76fa477ffe0d0833ff2b364a6046 Mon Sep 17 00:00:00 2001 From: Martin Hinz Date: Fri, 13 Dec 2024 17:00:13 +0100 Subject: [PATCH 2/9] updated rspec and removed fixture_path from rails_helper.rb --- Gemfile | 2 +- Gemfile.lock | 18 +++++++++--------- spec/rails_helper.rb | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Gemfile b/Gemfile index 5e40f2a4..29395251 100644 --- a/Gemfile +++ b/Gemfile @@ -184,7 +184,7 @@ end group :development, :test do # RSpec for testing - gem 'rspec-rails', '~> 4.0.1' + gem 'rspec-rails', '~> 7.0.0' # Generate test data from model specs gem 'factory_bot_rails' diff --git a/Gemfile.lock b/Gemfile.lock index 7fcee04b..1eb3063a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -400,14 +400,14 @@ GEM rspec-mocks (3.13.2) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.13.0) - rspec-rails (4.0.2) - actionpack (>= 4.2) - activesupport (>= 4.2) - railties (>= 4.2) - rspec-core (~> 3.10) - rspec-expectations (~> 3.10) - rspec-mocks (~> 3.10) - rspec-support (~> 3.10) + rspec-rails (7.0.2) + actionpack (>= 7.0) + activesupport (>= 7.0) + railties (>= 7.0) + rspec-core (~> 3.13) + rspec-expectations (~> 3.13) + rspec-mocks (~> 3.13) + rspec-support (~> 3.13) rspec-support (3.13.2) rubocop (1.69.2) json (~> 2.3) @@ -552,7 +552,7 @@ DEPENDENCIES rack-brotli rails (~> 7.1.0) redis (~> 4.0) - rspec-rails (~> 4.0.1) + rspec-rails (~> 7.0.0) rubocop rubocop-rails ruby-progressbar diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb index 75f09253..47d3e99c 100644 --- a/spec/rails_helper.rb +++ b/spec/rails_helper.rb @@ -35,7 +35,7 @@ end RSpec.configure do |config| # Remove this line if you're not using ActiveRecord or ActiveRecord fixtures - config.fixture_path = "#{::Rails.root}/spec/fixtures" + # config.fixture_path = "#{::Rails.root}/spec/fixtures" # If you're not using ActiveRecord, or you'd prefer not to run each of your # examples within a transaction, remove the following line or assign false From 73e73d133bd16a48df774bcc03c2d5a31ec1eb66 Mon Sep 17 00:00:00 2001 From: Martin Hinz Date: Fri, 13 Dec 2024 17:04:41 +0100 Subject: [PATCH 3/9] updated defaults to 7.0 --- config/application.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/application.rb b/config/application.rb index ee895f2e..3a6e7217 100644 --- a/config/application.rb +++ b/config/application.rb @@ -9,7 +9,7 @@ module Xronos class Application < Rails::Application # Initialize configuration defaults for originally generated Rails version. - config.load_defaults 5.2 + config.load_defaults 7.0 config.assets.precompile += %w(*.png *.jpg *.jpeg *.gif) From a1c08f02ce4eda6c003e08dcb354e0310f3845d8 Mon Sep 17 00:00:00 2001 From: Martin Hinz Date: Fri, 13 Dec 2024 17:28:44 +0100 Subject: [PATCH 4/9] updated devise --- Gemfile | 2 +- Gemfile.lock | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile b/Gemfile index 29395251..56fd465a 100644 --- a/Gemfile +++ b/Gemfile @@ -67,7 +67,7 @@ gem 'stimulus-rails' # USERS & PERMISSIONS --------------------------------------------------------- # User management -gem 'devise', '>= 4.7.1' +gem 'devise', '>= 4.9.4' # Authorizations management gem 'cancancan' diff --git a/Gemfile.lock b/Gemfile.lock index 1eb3063a..83c66f00 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -521,7 +521,7 @@ DEPENDENCIES country_select csl-styles cssbundling-rails - devise (>= 4.7.1) + devise (>= 4.9.4) doorkeeper dotenv-rails factory_bot_rails From 61c5713220b6471c569d5d5e33ab872304e11e10 Mon Sep 17 00:00:00 2001 From: Martin Hinz Date: Fri, 13 Dec 2024 17:52:37 +0100 Subject: [PATCH 5/9] bumped to ruby 3.1.6 --- .ruby-version | 2 +- Dockerfile | 2 +- Dockerfile.staging | 2 +- Gemfile | 2 +- Gemfile.lock | 7 +++++-- 5 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.ruby-version b/.ruby-version index b0f2dcb3..9cec7165 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -3.0.4 +3.1.6 diff --git a/Dockerfile b/Dockerfile index 4741c7e0..53f9c6a7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # base image -FROM ruby:3.0.4 +FROM ruby:3.1.6 MAINTAINER Martin Hinz # install node and yarn diff --git a/Dockerfile.staging b/Dockerfile.staging index d5d18a8a..ec89ef5e 100644 --- a/Dockerfile.staging +++ b/Dockerfile.staging @@ -1,5 +1,5 @@ # base image -FROM ruby:3.0.4 +FROM ruby:3.1.6 MAINTAINER Martin Hinz # install node and yarn diff --git a/Gemfile b/Gemfile index 56fd465a..07a1ae73 100644 --- a/Gemfile +++ b/Gemfile @@ -5,7 +5,7 @@ git_source(:github) { |repo| 'https://github.com/#{repo}.git' } # CORE ------------------------------------------------------------------------ # Ruby on Rails -ruby '3.0.4' +ruby '3.1.6' gem 'rails', '~> 7.1.0' # Database for Active Record diff --git a/Gemfile.lock b/Gemfile.lock index 83c66f00..eb9b87ca 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -193,7 +193,9 @@ GEM feedjira (3.2.3) loofah (>= 2.3.1, < 3) sax-machine (>= 1.0, < 2) - ffi (1.17.0) + ffi (1.17.0-arm64-darwin) + ffi (1.17.0-x86_64-darwin) + ffi (1.17.0-x86_64-linux-gnu) formatador (1.1.0) gbifrb (0.2.0) geocoder (1.8.4) @@ -501,6 +503,7 @@ GEM PLATFORMS arm64-darwin-23 + arm64-darwin-24 x86_64-darwin-21 x86_64-linux @@ -573,7 +576,7 @@ DEPENDENCIES whenever RUBY VERSION - ruby 3.0.4p208 + ruby 3.1.6p260 BUNDLED WITH 2.5.1 From 56576989f0ad6f0b7f33fb43f57f795d7f991205 Mon Sep 17 00:00:00 2001 From: Martin Hinz Date: Sat, 14 Dec 2024 10:44:43 +0100 Subject: [PATCH 6/9] since in Ruby 3.2, Data is reserved, renaming everything to XronosData, while preserving functionality --- ...data_controller.rb => xronos_data_controller.rb} | 2 +- ...data_controller.rb => xronos_data_controller.rb} | 4 ++-- app/helpers/data_helper.rb | 2 -- app/helpers/xronos_data_helper.rb | 2 ++ app/models/typo.rb | 2 +- app/models/{data.rb => xronos_data.rb} | 2 +- .../v1/{data => xronos_data}/_data.json.jbuilder | 0 .../v1/{data => xronos_data}/index.geojson.jbuilder | 0 .../v1/{data => xronos_data}/index.json.jbuilder | 0 .../{data => xronos_data}/_filter_fields.html.erb | 0 .../{data => xronos_data}/_filter_status.html.erb | 0 app/views/{data => xronos_data}/_filters.html.erb | 0 app/views/{data => xronos_data}/_map.html.erb | 0 app/views/{data => xronos_data}/_table.html.erb | 0 app/views/{data => xronos_data}/_toolbar.html.erb | 0 app/views/{data => xronos_data}/index.html.erb | 0 config/routes.rb | 13 ++++++------- 17 files changed, 13 insertions(+), 14 deletions(-) rename app/controllers/api/v1/{data_controller.rb => xronos_data_controller.rb} (97%) rename app/controllers/{data_controller.rb => xronos_data_controller.rb} (96%) delete mode 100644 app/helpers/data_helper.rb create mode 100644 app/helpers/xronos_data_helper.rb rename app/models/{data.rb => xronos_data.rb} (99%) rename app/views/api/v1/{data => xronos_data}/_data.json.jbuilder (100%) rename app/views/api/v1/{data => xronos_data}/index.geojson.jbuilder (100%) rename app/views/api/v1/{data => xronos_data}/index.json.jbuilder (100%) rename app/views/{data => xronos_data}/_filter_fields.html.erb (100%) rename app/views/{data => xronos_data}/_filter_status.html.erb (100%) rename app/views/{data => xronos_data}/_filters.html.erb (100%) rename app/views/{data => xronos_data}/_map.html.erb (100%) rename app/views/{data => xronos_data}/_table.html.erb (100%) rename app/views/{data => xronos_data}/_toolbar.html.erb (100%) rename app/views/{data => xronos_data}/index.html.erb (100%) diff --git a/app/controllers/api/v1/data_controller.rb b/app/controllers/api/v1/xronos_data_controller.rb similarity index 97% rename from app/controllers/api/v1/data_controller.rb rename to app/controllers/api/v1/xronos_data_controller.rb index 8c7be442..2b092c6c 100644 --- a/app/controllers/api/v1/data_controller.rb +++ b/app/controllers/api/v1/xronos_data_controller.rb @@ -1,6 +1,6 @@ module Api module V1 - class DataController < ApplicationController + class XronosDataController < ApplicationController before_action only: [:create, :update, :destroy] do doorkeeper_authorize! :admin diff --git a/app/controllers/data_controller.rb b/app/controllers/xronos_data_controller.rb similarity index 96% rename from app/controllers/data_controller.rb rename to app/controllers/xronos_data_controller.rb index e7795aaf..766c8a62 100644 --- a/app/controllers/data_controller.rb +++ b/app/controllers/xronos_data_controller.rb @@ -1,4 +1,4 @@ -class DataController < ApplicationController +class XronosDataController < ApplicationController include Pagy::Backend def turn_off_lasso @@ -12,7 +12,7 @@ def reset_manual_table_selection end def index - @data = Data.new(filter_params, select_params) + @data = XronosData.new(filter_params, select_params) @raw_filter_params = filter_params logger.debug { "Parsed filters: #{@data.filters.inspect}" } @sites = @data.xrons.select("sites.id", "sites.lng", "sites.lat", "sites.name").distinct diff --git a/app/helpers/data_helper.rb b/app/helpers/data_helper.rb deleted file mode 100644 index e68f25eb..00000000 --- a/app/helpers/data_helper.rb +++ /dev/null @@ -1,2 +0,0 @@ -module DataHelper -end diff --git a/app/helpers/xronos_data_helper.rb b/app/helpers/xronos_data_helper.rb new file mode 100644 index 00000000..d35a5d2f --- /dev/null +++ b/app/helpers/xronos_data_helper.rb @@ -0,0 +1,2 @@ +module XronosDataHelper +end diff --git a/app/models/typo.rb b/app/models/typo.rb index 83a8b658..b694473b 100644 --- a/app/models/typo.rb +++ b/app/models/typo.rb @@ -17,7 +17,7 @@ # index_typos_on_sample_id (sample_id) # class Typo < ApplicationRecord - include DataHelper + include XronosDataHelper has_paper_trail acts_as_copy_target # enable CSV exports diff --git a/app/models/data.rb b/app/models/xronos_data.rb similarity index 99% rename from app/models/data.rb rename to app/models/xronos_data.rb index c93b9309..85a46968 100644 --- a/app/models/data.rb +++ b/app/models/xronos_data.rb @@ -1,4 +1,4 @@ -class Data +class XronosData include ActiveModel::Model attr_accessor :xrons diff --git a/app/views/api/v1/data/_data.json.jbuilder b/app/views/api/v1/xronos_data/_data.json.jbuilder similarity index 100% rename from app/views/api/v1/data/_data.json.jbuilder rename to app/views/api/v1/xronos_data/_data.json.jbuilder diff --git a/app/views/api/v1/data/index.geojson.jbuilder b/app/views/api/v1/xronos_data/index.geojson.jbuilder similarity index 100% rename from app/views/api/v1/data/index.geojson.jbuilder rename to app/views/api/v1/xronos_data/index.geojson.jbuilder diff --git a/app/views/api/v1/data/index.json.jbuilder b/app/views/api/v1/xronos_data/index.json.jbuilder similarity index 100% rename from app/views/api/v1/data/index.json.jbuilder rename to app/views/api/v1/xronos_data/index.json.jbuilder diff --git a/app/views/data/_filter_fields.html.erb b/app/views/xronos_data/_filter_fields.html.erb similarity index 100% rename from app/views/data/_filter_fields.html.erb rename to app/views/xronos_data/_filter_fields.html.erb diff --git a/app/views/data/_filter_status.html.erb b/app/views/xronos_data/_filter_status.html.erb similarity index 100% rename from app/views/data/_filter_status.html.erb rename to app/views/xronos_data/_filter_status.html.erb diff --git a/app/views/data/_filters.html.erb b/app/views/xronos_data/_filters.html.erb similarity index 100% rename from app/views/data/_filters.html.erb rename to app/views/xronos_data/_filters.html.erb diff --git a/app/views/data/_map.html.erb b/app/views/xronos_data/_map.html.erb similarity index 100% rename from app/views/data/_map.html.erb rename to app/views/xronos_data/_map.html.erb diff --git a/app/views/data/_table.html.erb b/app/views/xronos_data/_table.html.erb similarity index 100% rename from app/views/data/_table.html.erb rename to app/views/xronos_data/_table.html.erb diff --git a/app/views/data/_toolbar.html.erb b/app/views/xronos_data/_toolbar.html.erb similarity index 100% rename from app/views/data/_toolbar.html.erb rename to app/views/xronos_data/_toolbar.html.erb diff --git a/app/views/data/index.html.erb b/app/views/xronos_data/index.html.erb similarity index 100% rename from app/views/data/index.html.erb rename to app/views/xronos_data/index.html.erb diff --git a/config/routes.rb b/config/routes.rb index da1bf9e0..bfbfc7e4 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -72,15 +72,15 @@ # Data browser get 'data/index' post 'data/index' - get "/data" => "data#index" + get "/data" => "xronos_data#index" # Search get "search" => "searches#index" # Data filter controls - get '/resetfilter', :to=>'data#reset_filter_session_variable' - get '/turn_off_lasso', :to=>'data#turn_off_lasso' - get '/reset_manual_table_selection', :to=>'data#reset_manual_table_selection' + get '/resetfilter', to: 'xronos_data#reset_filter_session_variable' + get '/turn_off_lasso', to: 'xronos_data#turn_off_lasso' + get '/reset_manual_table_selection', to: 'xronos_data#reset_manual_table_selection' # Curation backend get "/curate" => "curate#index" @@ -130,9 +130,8 @@ # API namespace :api, defaults: {format: 'json'} do namespace :v1 do - resources :data + resources :data, controller: 'xronos_data' end end -end - +end \ No newline at end of file From 757c53f7af302718ec406731561e705584269c85 Mon Sep 17 00:00:00 2001 From: Martin Hinz Date: Sat, 14 Dec 2024 10:47:59 +0100 Subject: [PATCH 7/9] bumped to Ruby 3.2.6 --- .ruby-version | 2 +- Dockerfile | 2 +- Dockerfile.staging | 2 +- Gemfile | 2 +- Gemfile.lock | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.ruby-version b/.ruby-version index 9cec7165..34cde569 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -3.1.6 +3.2.6 diff --git a/Dockerfile b/Dockerfile index 53f9c6a7..ef5542c6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # base image -FROM ruby:3.1.6 +FROM ruby:3.2.6 MAINTAINER Martin Hinz # install node and yarn diff --git a/Dockerfile.staging b/Dockerfile.staging index ec89ef5e..b2d329c4 100644 --- a/Dockerfile.staging +++ b/Dockerfile.staging @@ -1,5 +1,5 @@ # base image -FROM ruby:3.1.6 +FROM ruby:3.2.6 MAINTAINER Martin Hinz # install node and yarn diff --git a/Gemfile b/Gemfile index 07a1ae73..dbcd9e0a 100644 --- a/Gemfile +++ b/Gemfile @@ -5,7 +5,7 @@ git_source(:github) { |repo| 'https://github.com/#{repo}.git' } # CORE ------------------------------------------------------------------------ # Ruby on Rails -ruby '3.1.6' +ruby '3.2.6' gem 'rails', '~> 7.1.0' # Database for Active Record diff --git a/Gemfile.lock b/Gemfile.lock index eb9b87ca..f31c8c7d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -576,7 +576,7 @@ DEPENDENCIES whenever RUBY VERSION - ruby 3.1.6p260 + ruby 3.2.6p234 BUNDLED WITH 2.5.1 From 1a2a5899b74c1050b564bc97c304d0a23a7d0fd0 Mon Sep 17 00:00:00 2001 From: Martin Hinz Date: Sat, 14 Dec 2024 11:20:27 +0100 Subject: [PATCH 8/9] bumped to Ruby 3.3.6 --- .ruby-version | 2 +- Dockerfile | 2 +- Dockerfile.staging | 2 +- Gemfile | 2 +- Gemfile.lock | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.ruby-version b/.ruby-version index 34cde569..9c25013d 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -3.2.6 +3.3.6 diff --git a/Dockerfile b/Dockerfile index ef5542c6..cfe4dbcd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # base image -FROM ruby:3.2.6 +FROM ruby:3.3.6 MAINTAINER Martin Hinz # install node and yarn diff --git a/Dockerfile.staging b/Dockerfile.staging index b2d329c4..e888c485 100644 --- a/Dockerfile.staging +++ b/Dockerfile.staging @@ -1,5 +1,5 @@ # base image -FROM ruby:3.2.6 +FROM ruby:3.3.6 MAINTAINER Martin Hinz # install node and yarn diff --git a/Gemfile b/Gemfile index dbcd9e0a..cb6c975c 100644 --- a/Gemfile +++ b/Gemfile @@ -5,7 +5,7 @@ git_source(:github) { |repo| 'https://github.com/#{repo}.git' } # CORE ------------------------------------------------------------------------ # Ruby on Rails -ruby '3.2.6' +ruby '3.3.6' gem 'rails', '~> 7.1.0' # Database for Active Record diff --git a/Gemfile.lock b/Gemfile.lock index f31c8c7d..b4f049a1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -576,7 +576,7 @@ DEPENDENCIES whenever RUBY VERSION - ruby 3.2.6p234 + ruby 3.3.6p108 BUNDLED WITH 2.5.1 From 5fb683db65d9b0f140c19297e8b90abdec6813cf Mon Sep 17 00:00:00 2001 From: Martin Hinz Date: Sat, 14 Dec 2024 11:25:51 +0100 Subject: [PATCH 9/9] bumped to Rails 7.2 --- Gemfile | 2 +- Gemfile.lock | 138 ++++++++++++++++++++++++--------------------------- 2 files changed, 67 insertions(+), 73 deletions(-) diff --git a/Gemfile b/Gemfile index cb6c975c..0127e4fd 100644 --- a/Gemfile +++ b/Gemfile @@ -6,7 +6,7 @@ git_source(:github) { |repo| 'https://github.com/#{repo}.git' } # Ruby on Rails ruby '3.3.6' -gem 'rails', '~> 7.1.0' +gem 'rails', '~> 7.2' # Database for Active Record gem 'pg' diff --git a/Gemfile.lock b/Gemfile.lock index b4f049a1..dddd7992 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,63 +1,58 @@ GEM remote: https://rubygems.org/ specs: - actioncable (7.1.5.1) - actionpack (= 7.1.5.1) - activesupport (= 7.1.5.1) + actioncable (7.2.2.1) + actionpack (= 7.2.2.1) + activesupport (= 7.2.2.1) nio4r (~> 2.0) websocket-driver (>= 0.6.1) zeitwerk (~> 2.6) - actionmailbox (7.1.5.1) - actionpack (= 7.1.5.1) - activejob (= 7.1.5.1) - activerecord (= 7.1.5.1) - activestorage (= 7.1.5.1) - activesupport (= 7.1.5.1) - mail (>= 2.7.1) - net-imap - net-pop - net-smtp - actionmailer (7.1.5.1) - actionpack (= 7.1.5.1) - actionview (= 7.1.5.1) - activejob (= 7.1.5.1) - activesupport (= 7.1.5.1) - mail (~> 2.5, >= 2.5.4) - net-imap - net-pop - net-smtp + actionmailbox (7.2.2.1) + actionpack (= 7.2.2.1) + activejob (= 7.2.2.1) + activerecord (= 7.2.2.1) + activestorage (= 7.2.2.1) + activesupport (= 7.2.2.1) + mail (>= 2.8.0) + actionmailer (7.2.2.1) + actionpack (= 7.2.2.1) + actionview (= 7.2.2.1) + activejob (= 7.2.2.1) + activesupport (= 7.2.2.1) + mail (>= 2.8.0) rails-dom-testing (~> 2.2) - actionpack (7.1.5.1) - actionview (= 7.1.5.1) - activesupport (= 7.1.5.1) + actionpack (7.2.2.1) + actionview (= 7.2.2.1) + activesupport (= 7.2.2.1) nokogiri (>= 1.8.5) racc - rack (>= 2.2.4) + rack (>= 2.2.4, < 3.2) rack-session (>= 1.0.1) rack-test (>= 0.6.3) rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) - actiontext (7.1.5.1) - actionpack (= 7.1.5.1) - activerecord (= 7.1.5.1) - activestorage (= 7.1.5.1) - activesupport (= 7.1.5.1) + useragent (~> 0.16) + actiontext (7.2.2.1) + actionpack (= 7.2.2.1) + activerecord (= 7.2.2.1) + activestorage (= 7.2.2.1) + activesupport (= 7.2.2.1) globalid (>= 0.6.0) nokogiri (>= 1.8.5) - actionview (7.1.5.1) - activesupport (= 7.1.5.1) + actionview (7.2.2.1) + activesupport (= 7.2.2.1) builder (~> 3.1) erubi (~> 1.11) rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) - activejob (7.1.5.1) - activesupport (= 7.1.5.1) + activejob (7.2.2.1) + activesupport (= 7.2.2.1) globalid (>= 0.3.6) - activemodel (7.1.5.1) - activesupport (= 7.1.5.1) - activerecord (7.1.5.1) - activemodel (= 7.1.5.1) - activesupport (= 7.1.5.1) + activemodel (7.2.2.1) + activesupport (= 7.2.2.1) + activerecord (7.2.2.1) + activemodel (= 7.2.2.1) + activesupport (= 7.2.2.1) timeout (>= 0.4.0) activerecord-session_store (2.1.0) actionpack (>= 6.1) @@ -66,25 +61,24 @@ GEM multi_json (~> 1.11, >= 1.11.2) rack (>= 2.0.8, < 4) railties (>= 6.1) - activestorage (7.1.5.1) - actionpack (= 7.1.5.1) - activejob (= 7.1.5.1) - activerecord (= 7.1.5.1) - activesupport (= 7.1.5.1) + activestorage (7.2.2.1) + actionpack (= 7.2.2.1) + activejob (= 7.2.2.1) + activerecord (= 7.2.2.1) + activesupport (= 7.2.2.1) marcel (~> 1.0) - activesupport (7.1.5.1) + activesupport (7.2.2.1) base64 benchmark (>= 0.3) bigdecimal - concurrent-ruby (~> 1.0, >= 1.0.2) + concurrent-ruby (~> 1.0, >= 1.3.1) connection_pool (>= 2.2.5) drb i18n (>= 1.6, < 2) logger (>= 1.4.2) minitest (>= 5.1) - mutex_m securerandom (>= 0.3) - tzinfo (~> 2.0) + tzinfo (~> 2.0, >= 2.0.5) addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) annotate (3.2.0) @@ -272,13 +266,12 @@ GEM minitest (5.25.4) multi_json (1.15.0) multi_xml (0.6.0) - mutex_m (0.3.0) namae (1.2.0) racc (~> 1.7) nenv (0.3.0) net-http (0.6.0) uri - net-imap (0.4.18) + net-imap (0.5.1) date net-protocol net-pop (0.1.2) @@ -344,20 +337,20 @@ GEM rack (>= 1.3) rackup (2.2.1) rack (>= 3) - rails (7.1.5.1) - actioncable (= 7.1.5.1) - actionmailbox (= 7.1.5.1) - actionmailer (= 7.1.5.1) - actionpack (= 7.1.5.1) - actiontext (= 7.1.5.1) - actionview (= 7.1.5.1) - activejob (= 7.1.5.1) - activemodel (= 7.1.5.1) - activerecord (= 7.1.5.1) - activestorage (= 7.1.5.1) - activesupport (= 7.1.5.1) + rails (7.2.2.1) + actioncable (= 7.2.2.1) + actionmailbox (= 7.2.2.1) + actionmailer (= 7.2.2.1) + actionpack (= 7.2.2.1) + actiontext (= 7.2.2.1) + actionview (= 7.2.2.1) + activejob (= 7.2.2.1) + activemodel (= 7.2.2.1) + activerecord (= 7.2.2.1) + activestorage (= 7.2.2.1) + activesupport (= 7.2.2.1) bundler (>= 1.15.0) - railties (= 7.1.5.1) + railties (= 7.2.2.1) rails-dom-testing (2.2.0) activesupport (>= 5.0.0) minitest @@ -365,10 +358,10 @@ GEM rails-html-sanitizer (1.6.2) loofah (~> 2.21) 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) - railties (7.1.5.1) - actionpack (= 7.1.5.1) - activesupport (= 7.1.5.1) - irb + railties (7.2.2.1) + actionpack (= 7.2.2.1) + activesupport (= 7.2.2.1) + irb (~> 1.13) rackup (>= 1.0.0) rake (>= 12.2) thor (~> 1.0, >= 1.2.2) @@ -378,7 +371,7 @@ GEM rb-fsevent (0.11.2) rb-inotify (0.11.1) ffi (~> 1.0) - rdoc (6.8.1) + rdoc (6.9.0) psych (>= 4.0.0) redis (4.8.1) regexp_parser (2.9.3) @@ -437,7 +430,7 @@ GEM scenic (1.8.0) activerecord (>= 4.0.0) railties (>= 4.0.0) - securerandom (0.3.2) + securerandom (0.4.0) selenium-webdriver (4.26.0) base64 (~> 0.2) logger (~> 1.4) @@ -480,6 +473,7 @@ GEM unicode-emoji (4.0.4) uniform_notifier (1.16.0) uri (1.0.2) + useragent (0.16.11) validate_url (1.0.15) activemodel (>= 3.0.0) public_suffix @@ -499,7 +493,7 @@ GEM chronic (>= 0.6.3) xpath (3.2.0) nokogiri (~> 1.8) - zeitwerk (2.6.18) + zeitwerk (2.7.1) PLATFORMS arm64-darwin-23 @@ -553,7 +547,7 @@ DEPENDENCIES propshaft (>= 0.6.2) puma rack-brotli - rails (~> 7.1.0) + rails (~> 7.2) redis (~> 4.0) rspec-rails (~> 7.0.0) rubocop