From 0581214317355dcc775a80a06d323cfc7e63f4fc Mon Sep 17 00:00:00 2001 From: Alicia Paz Date: Mon, 21 Oct 2024 18:38:15 -0600 Subject: [PATCH] Upgrade to rails 7.0.8.5 (#619) * Upgrade to rails 7.0.8.5 * Fix CI * Fix CI --- Gemfile | 4 +- Gemfile.lock | 477 +++++++++--------- app/assets/config/manifest.js | 1 + app/models/location.rb | 2 +- config/boot.rb | 2 - config/environment.rb | 2 - db/schema.rb | 2 +- .../service/better_s3_service.rb | 2 +- spec/rails_helper.rb | 2 +- 9 files changed, 247 insertions(+), 247 deletions(-) diff --git a/Gemfile b/Gemfile index 67498a4c9..5eb7f2790 100644 --- a/Gemfile +++ b/Gemfile @@ -6,7 +6,7 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" } ruby "3.1.0" # Bundle edge Rails instead: gem 'rails', github: 'rails/rails', branch: 'main' -gem "rails", "~> 6.1.7.9" +gem "rails", "~> 7.0.8.5" # Use postgresql as the database for Active Record gem "pg", "~> 1.1" # Use Puma as the app server @@ -80,6 +80,8 @@ gem "activerecord-postgis-adapter" # Instagram feed gem "koala" +gem "sprockets-rails", require: "sprockets/railtie" + group :development, :test do eval_gemfile "gemfiles/rubocop.gemfile" # Call 'byebug' anywhere in the code to stop execution and get a debugger console diff --git a/Gemfile.lock b/Gemfile.lock index 3adc7257c..2b451418f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -10,133 +10,140 @@ GIT GEM remote: https://rubygems.org/ specs: - actioncable (6.1.7.9) - actionpack (= 6.1.7.9) - activesupport (= 6.1.7.9) + actioncable (7.0.8.5) + actionpack (= 7.0.8.5) + activesupport (= 7.0.8.5) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (6.1.7.9) - actionpack (= 6.1.7.9) - activejob (= 6.1.7.9) - activerecord (= 6.1.7.9) - activestorage (= 6.1.7.9) - activesupport (= 6.1.7.9) + actionmailbox (7.0.8.5) + actionpack (= 7.0.8.5) + activejob (= 7.0.8.5) + activerecord (= 7.0.8.5) + activestorage (= 7.0.8.5) + activesupport (= 7.0.8.5) mail (>= 2.7.1) - actionmailer (6.1.7.9) - actionpack (= 6.1.7.9) - actionview (= 6.1.7.9) - activejob (= 6.1.7.9) - activesupport (= 6.1.7.9) + net-imap + net-pop + net-smtp + actionmailer (7.0.8.5) + actionpack (= 7.0.8.5) + actionview (= 7.0.8.5) + activejob (= 7.0.8.5) + activesupport (= 7.0.8.5) mail (~> 2.5, >= 2.5.4) + net-imap + net-pop + net-smtp rails-dom-testing (~> 2.0) - actionpack (6.1.7.9) - actionview (= 6.1.7.9) - activesupport (= 6.1.7.9) - rack (~> 2.0, >= 2.0.9) + actionpack (7.0.8.5) + actionview (= 7.0.8.5) + activesupport (= 7.0.8.5) + rack (~> 2.0, >= 2.2.4) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (6.1.7.9) - actionpack (= 6.1.7.9) - activerecord (= 6.1.7.9) - activestorage (= 6.1.7.9) - activesupport (= 6.1.7.9) + actiontext (7.0.8.5) + actionpack (= 7.0.8.5) + activerecord (= 7.0.8.5) + activestorage (= 7.0.8.5) + activesupport (= 7.0.8.5) + globalid (>= 0.6.0) nokogiri (>= 1.8.5) - actionview (6.1.7.9) - activesupport (= 6.1.7.9) + actionview (7.0.8.5) + activesupport (= 7.0.8.5) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - active_storage_validations (1.2.0) - activejob (>= 5.2.0) - activemodel (>= 5.2.0) - activestorage (>= 5.2.0) - activesupport (>= 5.2.0) - activejob (6.1.7.9) - activesupport (= 6.1.7.9) + active_storage_validations (1.3.0) + activejob (>= 6.1.4) + activemodel (>= 6.1.4) + activestorage (>= 6.1.4) + activesupport (>= 6.1.4) + activejob (7.0.8.5) + activesupport (= 7.0.8.5) globalid (>= 0.3.6) - activemodel (6.1.7.9) - activesupport (= 6.1.7.9) - activemodel-serializers-xml (1.0.2) - activemodel (> 5.x) - activesupport (> 5.x) + activemodel (7.0.8.5) + activesupport (= 7.0.8.5) + activemodel-serializers-xml (1.0.3) + activemodel (>= 5.0.0.a) + activesupport (>= 5.0.0.a) builder (~> 3.1) - activerecord (6.1.7.9) - activemodel (= 6.1.7.9) - activesupport (= 6.1.7.9) + activerecord (7.0.8.5) + activemodel (= 7.0.8.5) + activesupport (= 7.0.8.5) activerecord-import (1.8.1) activerecord (>= 4.2) - activerecord-postgis-adapter (7.1.1) - activerecord (~> 6.1) + activerecord-postgis-adapter (8.0.3) + activerecord (~> 7.0.0) rgeo-activerecord (~> 7.0.0) - activestorage (6.1.7.9) - actionpack (= 6.1.7.9) - activejob (= 6.1.7.9) - activerecord (= 6.1.7.9) - activesupport (= 6.1.7.9) + activestorage (7.0.8.5) + actionpack (= 7.0.8.5) + activejob (= 7.0.8.5) + activerecord (= 7.0.8.5) + activesupport (= 7.0.8.5) marcel (~> 1.0) mini_mime (>= 1.1.0) - activesupport (6.1.7.9) + activesupport (7.0.8.5) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) tzinfo (~> 2.0) - zeitwerk (~> 2.3) - addressable (2.8.0) - public_suffix (>= 2.0.2, < 5.0) - administrate (0.19.0) - actionpack (>= 5.0) - actionview (>= 5.0) - activerecord (>= 5.0) - jquery-rails (>= 4.0) - kaminari (>= 1.0) + addressable (2.8.7) + public_suffix (>= 2.0.2, < 7.0) + administrate (0.20.1) + actionpack (>= 6.0, < 8.0) + actionview (>= 6.0, < 8.0) + activerecord (>= 6.0, < 8.0) + jquery-rails (~> 4.6.0) + kaminari (~> 1.2.2) sassc-rails (~> 2.1) selectize-rails (~> 0.6) - administrate-field-active_storage (0.3.8) + administrate-field-active_storage (1.0.3) administrate (>= 0.2.2) - rails (>= 6.0) + rails (>= 7.0) administrate-field-select (2.1.0) administrate (~> 0.1, >= 0.1.5) annotate (3.2.0) activerecord (>= 3.2, < 8.0) rake (>= 10.4, < 14.0) ast (2.4.2) - aws-eventstream (1.2.0) - aws-partitions (1.540.0) - aws-sdk-core (3.124.0) - aws-eventstream (~> 1, >= 1.0.2) - aws-partitions (~> 1, >= 1.525.0) - aws-sigv4 (~> 1.1) - jmespath (~> 1.0) - aws-sdk-kms (1.52.0) - aws-sdk-core (~> 3, >= 3.122.0) - aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.109.0) - aws-sdk-core (~> 3, >= 3.122.0) + aws-eventstream (1.3.0) + aws-partitions (1.992.0) + aws-sdk-core (3.211.0) + aws-eventstream (~> 1, >= 1.3.0) + aws-partitions (~> 1, >= 1.992.0) + aws-sigv4 (~> 1.9) + jmespath (~> 1, >= 1.6.1) + aws-sdk-kms (1.95.0) + aws-sdk-core (~> 3, >= 3.210.0) + aws-sigv4 (~> 1.5) + aws-sdk-s3 (1.169.0) + aws-sdk-core (~> 3, >= 3.210.0) aws-sdk-kms (~> 1) - aws-sigv4 (~> 1.4) - aws-sigv4 (1.4.0) + aws-sigv4 (~> 1.5) + aws-sigv4 (1.10.1) aws-eventstream (~> 1, >= 1.0.2) - bcrypt (3.1.16) + base64 (0.2.0) + bcrypt (3.1.20) better_errors (2.10.1) erubi (>= 1.0.0) rack (>= 0.9.0) rouge (>= 1.0.0) bindex (0.8.1) - binding_of_caller (1.0.0) - debug_inspector (>= 0.0.1) - bootsnap (1.18.3) + binding_of_caller (1.0.1) + debug_inspector (>= 1.2.0) + bootsnap (1.18.4) msgpack (~> 1.2) - brakeman (6.1.2) + brakeman (6.2.2) racc builder (3.3.0) - bullet (7.1.6) + bullet (7.2.0) activesupport (>= 3.0.0) uniform_notifier (~> 1.11) bundle-audit (0.1.0) bundler-audit - bundler-audit (0.9.1) + bundler-audit (0.9.2) bundler (>= 1.2.0, < 3) thor (~> 1.0) byebug (11.1.3) @@ -154,6 +161,8 @@ GEM marcel (~> 1.0) nokogiri (~> 1.10, >= 1.10.4) rubyzip (>= 1.3.0, < 3) + childprocess (5.1.0) + logger (~> 1.5) city-state (1.1.0) rubyzip (>= 2.3) clockwork (3.0.2) @@ -161,26 +170,26 @@ GEM tzinfo cocoon (1.2.15) coderay (1.1.3) - concurrent-ruby (1.3.3) + concurrent-ruby (1.3.4) connection_pool (2.4.1) crass (1.0.6) - cssbundling-rails (1.4.0) + cssbundling-rails (1.4.1) railties (>= 6.0.0) - cuprite (0.15) + cuprite (0.15.1) capybara (~> 3.0) - ferrum (~> 0.14.0) - database_consistency (1.7.23) + ferrum (~> 0.15.0) + database_consistency (1.7.26) activerecord (>= 3.2) date (3.3.4) - debug_inspector (1.1.0) + debug_inspector (1.2.0) devise (4.9.4) bcrypt (~> 3.0) orm_adapter (~> 0.1) railties (>= 4.1.0) responders warden (~> 1.2.3) - diff-lcs (1.4.4) - docile (1.4.0) + diff-lcs (1.5.1) + docile (1.4.1) dotenv (3.1.4) draper (4.0.2) actionpack (>= 5.0) @@ -189,45 +198,32 @@ GEM activesupport (>= 5.0) request_store (>= 1.0) ruby2_keywords - erubi (1.12.0) + erubi (1.13.0) factory_bot (6.5.0) activesupport (>= 5.0.0) factory_bot_rails (6.4.3) factory_bot (~> 6.4) railties (>= 5.0.0) - faker (3.4.1) + faker (3.5.1) i18n (>= 1.8.11, < 2) - faraday (1.8.0) - faraday-em_http (~> 1.0) - faraday-em_synchrony (~> 1.0) - faraday-excon (~> 1.1) - faraday-httpclient (~> 1.0.1) - faraday-net_http (~> 1.0) - faraday-net_http_persistent (~> 1.1) - faraday-patron (~> 1.0) - faraday-rack (~> 1.0) - multipart-post (>= 1.2, < 3) - ruby2_keywords (>= 0.0.4) - faraday-em_http (1.0.0) - faraday-em_synchrony (1.0.0) - faraday-excon (1.1.0) - faraday-httpclient (1.0.1) + faraday (2.12.0) + faraday-net_http (>= 2.0, < 3.4) + json + logger faraday-multipart (1.0.4) multipart-post (~> 2) - faraday-net_http (1.0.1) - faraday-net_http_persistent (1.2.0) - faraday-patron (1.0.0) - faraday-rack (1.0.0) - ferrum (0.14) + faraday-net_http (3.3.0) + net-http + ferrum (0.15) addressable (~> 2.5) concurrent-ruby (~> 1.1) webrick (~> 1.7) - websocket-driver (>= 0.6, < 0.8) - ffi (1.15.5) - formatador (0.3.0) + websocket-driver (~> 0.7) + ffi (1.17.0) + formatador (1.1.0) globalid (1.2.1) activesupport (>= 6.1) - guard (2.18.0) + guard (2.18.1) formatador (>= 0.2.4) listen (>= 2.7, < 4.0) lumberjack (>= 1.0.12, < 2.0) @@ -242,9 +238,9 @@ GEM guard-compat (~> 1.1) rspec (>= 2.99.0, < 4.0) htmlentities (4.3.4) - i18n (1.14.5) + i18n (1.14.6) concurrent-ruby (~> 1.0) - image_processing (1.12.2) + image_processing (1.13.0) mini_magick (>= 4.9.5, < 5) ruby-vips (>= 2.0.17, < 3) inline_svg (1.10.0) @@ -255,45 +251,48 @@ GEM jbuilder (2.13.0) actionview (>= 5.0.0) activesupport (>= 5.0.0) - jmespath (1.6.1) - jquery-rails (4.4.0) + jmespath (1.6.2) + jquery-rails (4.6.0) rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) - jsbundling-rails (1.3.0) + jsbundling-rails (1.3.1) railties (>= 6.0.0) - json (2.6.2) - kaminari (1.2.1) + json (2.7.2) + kaminari (1.2.2) activesupport (>= 4.1.0) - kaminari-actionview (= 1.2.1) - kaminari-activerecord (= 1.2.1) - kaminari-core (= 1.2.1) - kaminari-actionview (1.2.1) + kaminari-actionview (= 1.2.2) + kaminari-activerecord (= 1.2.2) + kaminari-core (= 1.2.2) + kaminari-actionview (1.2.2) actionview - kaminari-core (= 1.2.1) - kaminari-activerecord (1.2.1) + kaminari-core (= 1.2.2) + kaminari-activerecord (1.2.2) activerecord - kaminari-core (= 1.2.1) - kaminari-core (1.2.1) - koala (3.5.0) + kaminari-core (= 1.2.2) + kaminari-core (1.2.2) + koala (3.6.0) addressable + base64 faraday faraday-multipart json (>= 1.8) rexml language_server-protocol (3.17.0.3) - launchy (2.5.0) - addressable (~> 2.7) + launchy (3.0.1) + addressable (~> 2.8) + childprocess (~> 5.0) letter_opener (1.10.0) launchy (>= 2.2, < 4) lint_roller (1.1.0) listen (3.9.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) + logger (1.6.1) loofah (2.22.0) crass (~> 1.0.2) nokogiri (>= 1.12.0) - lumberjack (1.2.8) + lumberjack (1.2.10) mail (2.8.1) mini_mime (>= 0.1.1) net-imap @@ -302,20 +301,22 @@ GEM marcel (1.0.4) matrix (0.4.2) method_source (1.1.0) - mini_magick (4.11.0) + mini_magick (4.13.2) mini_mime (1.1.5) - minitest (5.24.0) + minitest (5.25.1) mobility (1.1.3) i18n (>= 0.6.10, < 2) request_store (~> 1.0) - momentjs-rails (2.20.1) + momentjs-rails (2.29.4.1) railties (>= 3.1) - msgpack (1.4.2) - multipart-post (2.1.1) + msgpack (1.7.3) + multipart-post (2.4.1) name_of_person (1.1.3) activesupport (>= 5.2.0) nenv (0.3.0) - net-imap (0.4.12) + net-http (0.4.1) + uri + net-imap (0.5.0) date net-protocol net-pop (0.1.2) @@ -325,61 +326,60 @@ GEM net-smtp (0.5.0) net-protocol nio4r (2.7.3) - nokogiri (1.16.5-aarch64-linux) + nokogiri (1.16.7-aarch64-linux) racc (~> 1.4) - nokogiri (1.16.5-arm64-darwin) + nokogiri (1.16.7-arm64-darwin) racc (~> 1.4) - nokogiri (1.16.5-x86_64-darwin) + nokogiri (1.16.7-x86_64-darwin) racc (~> 1.4) - nokogiri (1.16.5-x86_64-linux) + nokogiri (1.16.7-x86_64-linux) racc (~> 1.4) notiffany (0.1.3) nenv (~> 0.1) shellany (~> 0.0) orm_adapter (0.5.0) ostruct (0.6.0) - pagy (8.4.4) - parallel (1.21.0) - parser (3.3.0.5) + pagy (9.1.0) + parallel (1.26.3) + parser (3.3.5.0) ast (~> 2.4.1) racc - pg (1.5.6) + pg (1.5.8) pg_search (2.3.7) activerecord (>= 6.1) activesupport (>= 6.1) - pry (0.14.1) + pry (0.14.2) coderay (~> 1.1) method_source (~> 1.0) - pry-rails (0.3.9) - pry (>= 0.10.4) - public_suffix (4.0.6) + pry-rails (0.3.11) + pry (>= 0.13.0) + public_suffix (6.0.1) puma (5.6.9) nio4r (~> 2.0) - pundit (2.3.2) + pundit (2.4.0) activesupport (>= 3.0.0) - racc (1.8.0) - rack (2.2.9) + racc (1.8.1) + rack (2.2.10) rack-attack (6.7.0) rack (>= 1.0, < 4) rack-mini-profiler (2.3.4) rack (>= 1.2.0) rack-test (2.1.0) rack (>= 1.3) - rails (6.1.7.9) - actioncable (= 6.1.7.9) - actionmailbox (= 6.1.7.9) - actionmailer (= 6.1.7.9) - actionpack (= 6.1.7.9) - actiontext (= 6.1.7.9) - actionview (= 6.1.7.9) - activejob (= 6.1.7.9) - activemodel (= 6.1.7.9) - activerecord (= 6.1.7.9) - activestorage (= 6.1.7.9) - activesupport (= 6.1.7.9) + rails (7.0.8.5) + actioncable (= 7.0.8.5) + actionmailbox (= 7.0.8.5) + actionmailer (= 7.0.8.5) + actionpack (= 7.0.8.5) + actiontext (= 7.0.8.5) + actionview (= 7.0.8.5) + activejob (= 7.0.8.5) + activemodel (= 7.0.8.5) + activerecord (= 7.0.8.5) + activestorage (= 7.0.8.5) + activesupport (= 7.0.8.5) bundler (>= 1.15.0) - railties (= 6.1.7.9) - sprockets-rails (>= 2.0.0) + railties (= 7.0.8.5) rails-controller-testing (1.0.5) actionpack (>= 5.0.1.rc1) actionview (>= 5.0.1.rc1) @@ -391,48 +391,48 @@ GEM rails-html-sanitizer (1.6.0) loofah (~> 2.21) nokogiri (~> 1.14) - railties (6.1.7.9) - actionpack (= 6.1.7.9) - activesupport (= 6.1.7.9) + railties (7.0.8.5) + actionpack (= 7.0.8.5) + activesupport (= 7.0.8.5) method_source rake (>= 12.2) thor (~> 1.0) - rainbow (3.0.0) + zeitwerk (~> 2.5) + rainbow (3.1.1) rake (13.2.1) - rb-fsevent (0.11.0) - rb-inotify (0.10.1) + rb-fsevent (0.11.2) + rb-inotify (0.11.1) ffi (~> 1.0) - recaptcha (5.16.0) + recaptcha (5.17.0) redis (4.8.1) - regexp_parser (2.2.0) - request_store (1.5.0) + regexp_parser (2.9.2) + request_store (1.7.0) rack (>= 1.4) - responders (3.0.1) - actionpack (>= 5.0) - railties (>= 5.0) - rexml (3.3.6) - strscan - rgeo (2.3.1) + responders (3.1.1) + actionpack (>= 5.2) + railties (>= 5.2) + rexml (3.3.8) + rgeo (3.0.1) rgeo-activerecord (7.0.1) activerecord (>= 5.0) rgeo (>= 1.0.0) - rollbar (3.5.2) + rollbar (3.6.0) roo (2.8.3) nokogiri (~> 1) rubyzip (>= 1.3.0, < 3.0.0) - rouge (4.2.1) - rspec (3.10.0) - rspec-core (~> 3.10.0) - rspec-expectations (~> 3.10.0) - rspec-mocks (~> 3.10.0) - rspec-core (3.10.1) - rspec-support (~> 3.10.0) - rspec-expectations (3.10.1) + rouge (4.4.0) + rspec (3.13.0) + rspec-core (~> 3.13.0) + rspec-expectations (~> 3.13.0) + rspec-mocks (~> 3.13.0) + rspec-core (3.13.2) + rspec-support (~> 3.13.0) + rspec-expectations (3.13.3) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.10.0) - rspec-mocks (3.10.2) + rspec-support (~> 3.13.0) + rspec-mocks (3.13.2) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.10.0) + rspec-support (~> 3.13.0) rspec-rails (5.0.3) actionpack (>= 5.2) activesupport (>= 5.2) @@ -448,42 +448,42 @@ GEM rspec-expectations (~> 3.0) rspec-mocks (~> 3.0) sidekiq (>= 5, < 8) - rspec-support (3.10.3) - rubocop (1.62.1) + rspec-support (3.13.1) + rubocop (1.66.1) 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.4, < 3.0) + rubocop-ast (>= 1.32.2, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 3.0) - rubocop-ast (1.31.2) - parser (>= 3.3.0.4) - rubocop-capybara (2.20.0) + rubocop-ast (1.32.3) + parser (>= 3.3.1.0) + rubocop-capybara (2.21.0) rubocop (~> 1.41) - rubocop-factory_bot (2.25.1) - rubocop (~> 1.41) - rubocop-performance (1.20.2) + rubocop-factory_bot (2.26.1) + rubocop (~> 1.61) + rubocop-performance (1.22.1) rubocop (>= 1.48.1, < 2.0) - rubocop-ast (>= 1.30.0, < 2.0) - rubocop-rails (2.23.1) + rubocop-ast (>= 1.31.1, < 2.0) + rubocop-rails (2.26.2) activesupport (>= 4.2.0) rack (>= 1.1) - rubocop (>= 1.33.0, < 2.0) - rubocop-ast (>= 1.30.0, < 2.0) + rubocop (>= 1.52.0, < 2.0) + rubocop-ast (>= 1.31.1, < 2.0) rubocop-rspec (2.31.0) rubocop (~> 1.40) rubocop-capybara (~> 2.17) rubocop-factory_bot (~> 2.22) rubocop-rspec_rails (~> 2.28) - rubocop-rspec_rails (2.29.0) - rubocop (~> 1.40) - ruby-progressbar (1.11.0) - ruby-vips (2.1.4) + rubocop-rspec_rails (2.29.1) + rubocop (~> 1.61) + ruby-progressbar (1.13.0) + ruby-vips (2.2.2) ffi (~> 1.12) + logger ruby2_keywords (0.0.5) rubyzip (2.3.2) sassc (2.4.0) @@ -512,11 +512,11 @@ GEM docile (~> 1.1) simplecov-html (~> 0.11) simplecov_json_formatter (~> 0.1) - simplecov-html (0.12.3) - simplecov_json_formatter (0.1.3) - slim (4.1.0) - temple (>= 0.7.6, < 0.9) - tilt (>= 2.0.6, < 2.1) + simplecov-html (0.13.1) + simplecov_json_formatter (0.1.4) + slim (5.2.1) + temple (~> 0.10.0) + tilt (>= 2.1.0) slim-rails (3.6.3) actionpack (>= 3.1) railties (>= 3.1) @@ -531,38 +531,38 @@ GEM actionpack (>= 6.1) activesupport (>= 6.1) sprockets (>= 3.0.0) - standard (1.35.1) + standard (1.41.1) language_server-protocol (~> 3.17.0.2) lint_roller (~> 1.0) - rubocop (~> 1.62.0) + rubocop (~> 1.66.0) standard-custom (~> 1.0.0) - standard-performance (~> 1.3) + standard-performance (~> 1.5) standard-custom (1.0.2) lint_roller (~> 1.0) rubocop (~> 1.50) - standard-performance (1.3.1) + standard-performance (1.5.0) lint_roller (~> 1.1) - rubocop-performance (~> 1.20.2) - standard-rails (1.0.2) + rubocop-performance (~> 1.22.0) + standard-rails (1.2.0) lint_roller (~> 1.0) - rubocop-rails (~> 2.23.1) - strscan (3.1.0) - temple (0.8.2) - test-prof (1.3.3) - thor (1.3.1) - tilt (2.0.10) - timecop (0.9.9) + rubocop-rails (~> 2.26.0) + temple (0.10.3) + test-prof (1.4.2) + thor (1.3.2) + tilt (2.4.0) + timecop (0.9.10) timeout (0.4.1) - timezone (1.3.26) + timezone (1.3.27) ostruct (~> 0.6) turbo-rails (2.0.11) actionpack (>= 6.0.0) railties (>= 6.0.0) tzinfo (2.0.6) concurrent-ruby (~> 1.0) - unicode-display_width (2.5.0) + unicode-display_width (2.6.0) uniform_notifier (1.16.0) - view_component (3.17.0) + uri (0.13.1) + view_component (3.18.0) activesupport (>= 5.2.0, < 8.0) concurrent-ruby (~> 1.0) method_source (~> 1.0) @@ -578,13 +578,13 @@ GEM rubyzip (>= 1.3.0) selenium-webdriver (~> 4.0, < 4.11) webrick (1.8.2) - websocket (1.2.10) + websocket (1.2.11) websocket-driver (0.7.6) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) xpath (3.2.0) nokogiri (~> 1.8) - zeitwerk (2.6.16) + zeitwerk (2.6.18) PLATFORMS aarch64-linux @@ -650,7 +650,7 @@ DEPENDENCIES pundit rack-attack rack-mini-profiler (~> 2.0) - rails (~> 6.1.7.9) + rails (~> 7.0.8.5) rails-controller-testing recaptcha redis (~> 4.0) @@ -668,6 +668,7 @@ DEPENDENCIES slim-rails spring spring-commands-rspec + sprockets-rails standard (~> 1)! standard-rails (~> 1.0, >= 1.0.2)! test-prof (~> 1.0) diff --git a/app/assets/config/manifest.js b/app/assets/config/manifest.js index df728277c..9d5f1f870 100644 --- a/app/assets/config/manifest.js +++ b/app/assets/config/manifest.js @@ -2,3 +2,4 @@ //= link_tree ../builds //= link application.css //= link application.tailwind.css +//= link administrate-field-active_storage/application.css \ No newline at end of file diff --git a/app/models/location.rb b/app/models/location.rb index 20834b396..b4e5e1445 100644 --- a/app/models/location.rb +++ b/app/models/location.rb @@ -25,7 +25,7 @@ class Location < ActiveRecord::Base include PgSearch::Model multisearchable against: [:name] - enum non_standard_office_hours: {appointment_only: 1, always_open: 2, no_set_business_hours: 3} + enum :non_standard_office_hours, {appointment_only: 1, always_open: 2, no_set_business_hours: 3} belongs_to :organization, optional: true diff --git a/config/boot.rb b/config/boot.rb index aef6d031e..988a5ddc4 100644 --- a/config/boot.rb +++ b/config/boot.rb @@ -1,5 +1,3 @@ -# frozen_string_literal: true - ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../Gemfile", __dir__) require "bundler/setup" # Set up gems listed in the Gemfile. diff --git a/config/environment.rb b/config/environment.rb index 7df99e89c..cac531577 100644 --- a/config/environment.rb +++ b/config/environment.rb @@ -1,5 +1,3 @@ -# frozen_string_literal: true - # Load the Rails application. require_relative "application" diff --git a/db/schema.rb b/db/schema.rb index ce037ac5b..8ae816cb8 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2024_05_18_174354) do +ActiveRecord::Schema[6.1].define(version: 2024_05_18_174354) do # These are extensions that must be enabled in order to support this database enable_extension "fuzzystrmatch" diff --git a/lib/active_storage/service/better_s3_service.rb b/lib/active_storage/service/better_s3_service.rb index 1c7460d1f..efa5ac325 100644 --- a/lib/active_storage/service/better_s3_service.rb +++ b/lib/active_storage/service/better_s3_service.rb @@ -10,7 +10,7 @@ class Service::BetterS3Service < Service::S3Service def initialize(bucket:, upload: {}, **options) @root = options.delete(:root) - super(bucket: bucket, upload: upload, **options) + super end private diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb index 8aa1e726e..a152d41d7 100644 --- a/spec/rails_helper.rb +++ b/spec/rails_helper.rb @@ -25,7 +25,7 @@ # directory. Alternatively, in the individual `*_spec.rb` files, manually # require only the support files necessary. # -Dir[Rails.root.join("spec/support/**/*.rb")].each { |f| require f } +Rails.root.glob("spec/support/**/*.rb").each { |f| require f } # Checks for pending migrations and applies them before tests are run. # If you are not using ActiveRecord, you can remove these lines.