diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index f5ce0be7..400f5949 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -1,6 +1,6 @@ # This configuration was generated by # `rubocop --auto-gen-config` -# on 2025-08-12 13:33:30 UTC using RuboCop version 1.79.2. +# on 2025-08-12 15:04:30 UTC using RuboCop version 1.79.2. # The point is for the user to remove these configuration records # one by one as the offenses are removed from the code base. # Note that changes in the inspected code, or installation of new @@ -545,7 +545,7 @@ Metrics/BlockNesting: # Offense count: 14 # Configuration parameters: CountComments, CountAsOne. Metrics/ClassLength: - Max: 646 + Max: 655 # Offense count: 24 # Configuration parameters: AllowedMethods, AllowedPatterns. @@ -1810,6 +1810,7 @@ Style/NumericPredicate: - 'app/helpers/application_helper.rb' - 'app/helpers/date_time_helper.rb' - 'app/helpers/format_helper.rb' + - 'app/lib/rails_version.rb' - 'app/models/cfp.rb' - 'app/models/conference.rb' - 'app/models/event.rb' @@ -2074,7 +2075,7 @@ Style/WordArray: EnforcedStyle: percent MinSize: 6 -# Offense count: 431 +# Offense count: 430 # This cop supports safe autocorrection (--autocorrect). # Configuration parameters: AllowHeredoc, AllowURI, AllowQualifiedName, URISchemes, IgnoreCopDirectives, AllowedPatterns, SplitStrings. # URISchemes: http, https diff --git a/Gemfile b/Gemfile index 417143dd..35ba4235 100644 --- a/Gemfile +++ b/Gemfile @@ -10,9 +10,9 @@ ruby '~> 3.3' # as web framework if next? - gem 'rails', '~> 7.1' + gem 'rails', '~> 8.0' else - gem 'rails', '~> 7.0' + gem 'rails', '~> 7.2' end # Use Puma as the app server @@ -192,10 +192,6 @@ gem 'icalendar' # to tame logs gem 'lograge' -# FIXME: https://github.com/ruby-concurrency/concurrent-ruby/commit/d7ce956dacd0b772273d39b8ed31a30cff7ecf38 -# remove after updating to rails to >7.1 -gem 'concurrent-ruby', '1.3.4' - group :development do # for static code analisys gem 'rubocop', require: false diff --git a/Gemfile.lock b/Gemfile.lock index b59e71e5..feeabffe 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,99 +1,105 @@ GEM remote: https://rubygems.org/ specs: - Ascii85 (2.0.1) - actioncable (7.0.8.4) - actionpack (= 7.0.8.4) - activesupport (= 7.0.8.4) + Ascii85 (1.1.0) + actioncable (7.2.2.1) + actionpack (= 7.2.2.1) + activesupport (= 7.2.2.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) - 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) - 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) + zeitwerk (~> 2.6) + 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.2.2.1) + actionview (= 7.2.2.1) + activesupport (= 7.2.2.1) + nokogiri (>= 1.8.5) + racc + rack (>= 2.2.4, < 3.2) + 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) + 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.0.8.4) - activesupport (= 7.0.8.4) + actionview (7.2.2.1) + activesupport (= 7.2.2.1) builder (~> 3.1) - erubi (~> 1.4) - rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.1, >= 1.2.0) + erubi (~> 1.11) + rails-dom-testing (~> 2.2) + rails-html-sanitizer (~> 1.6) active_model_serializers (0.10.15) actionpack (>= 4.1) activemodel (>= 4.1) case_transform (>= 0.2) jsonapi-renderer (>= 0.1.1.beta1, < 0.3) - activejob (7.0.8.4) - activesupport (= 7.0.8.4) + activejob (7.2.2.1) + activesupport (= 7.2.2.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) - 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) + 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) + 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) - mini_mime (>= 1.1.0) - activesupport (7.0.8.4) - concurrent-ruby (~> 1.0, >= 1.0.2) + activesupport (7.2.2.1) + base64 + benchmark (>= 0.3) + bigdecimal + concurrent-ruby (~> 1.0, >= 1.3.1) + connection_pool (>= 2.2.5) + drb i18n (>= 1.6, < 2) + logger (>= 1.4.2) minitest (>= 5.1) - tzinfo (~> 2.0) - acts_as_commentable_with_threading (2.0.1) - activerecord (>= 4.0) - activesupport (>= 4.0) - awesome_nested_set (>= 3.0) - acts_as_list (1.2.4) - activerecord (>= 6.1) - activesupport (>= 6.1) + securerandom (>= 0.3) + tzinfo (~> 2.0, >= 2.0.5) + acts_as_commentable_with_threading (1.2.0) + activerecord (>= 3.0) + activesupport (>= 3.0) + awesome_nested_set (>= 2.0) + acts_as_list (1.0.4) + activerecord (>= 4.2) addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) afm (0.2.2) - ajax-datatables-rails (1.5.0) - rails (>= 6.0) + ajax-datatables-rails (1.3.1) zeitwerk archive-zip (0.12.0) io-like (~> 0.3.0) ast (2.4.3) - autoprefixer-rails (10.4.21.0) + autoprefixer-rails (10.3.1.0) execjs (~> 2) awesome_nested_set (3.8.0) activerecord (>= 4.0.0, < 8.1) - base64 (0.2.0) + aws_cf_signer (0.1.3) + base64 (0.3.0) bcrypt (3.1.20) + benchmark (0.4.1) bigdecimal (3.2.2) bindex (0.8.1) bootstrap-sass (3.4.1) @@ -102,7 +108,7 @@ GEM bootstrap-switch-rails (3.3.3) builder (3.3.0) byebug (11.1.3) - cancancan (3.6.1) + cancancan (3.3.0) capybara (3.40.0) addressable matrix @@ -112,12 +118,13 @@ GEM rack-test (>= 0.6.3) regexp_parser (>= 1.5, < 3.0) xpath (~> 3.2) - carrierwave (3.0.7) - activemodel (>= 6.0.0) - activesupport (>= 6.0.0) + carrierwave (2.2.2) + activemodel (>= 5.0.0) + activesupport (>= 5.0.0) addressable (~> 2.6) image_processing (~> 1.1) marcel (~> 1.0.0) + mini_mime (>= 0.1.3) ssrf_filter (~> 1.0) carrierwave-bombshelter (0.2.2) activesupport (>= 3.2.0) @@ -125,48 +132,44 @@ GEM fastimage case_transform (0.2) activesupport - caxlsx (4.1.0) + caxlsx (3.1.0) htmlentities (~> 4.3, >= 4.3.4) marcel (~> 1.0) nokogiri (~> 1.10, >= 1.10.4) rubyzip (>= 1.3.0, < 3) - caxlsx_rails (0.6.4) + caxlsx_rails (0.6.2) actionpack (>= 3.1) caxlsx (>= 3.0) - chartkick (5.1.2) - childprocess (5.1.0) - logger (~> 1.5) + chartkick (4.1.3) chronic (0.10.2) chunky_png (1.4.0) - climate_control (1.2.0) - cloudinary (2.2.0) - faraday (>= 2.0.1, < 3.0.0) - faraday-follow_redirects (~> 0.3.0) - faraday-multipart (~> 1.0, >= 1.0.4) - ostruct + climate_control (1.0.1) + cloudinary (1.20.0) + aws_cf_signer + rest-client (>= 2.0.0) cocoon (1.2.15) - concurrent-ruby (1.3.4) + colorize (0.8.1) + concurrent-ruby (1.3.5) + connection_pool (2.5.3) countable-rails (0.0.1) railties (>= 3.1) - crack (1.0.0) - bigdecimal + crack (0.4.5) rexml crass (1.0.6) - csv (3.3.2) - daemons (1.4.1) - dalli (3.2.8) + daemons (1.4.0) + dalli (2.7.11) dante (0.2.0) database_cleaner (2.1.0) database_cleaner-active_record (>= 2, < 3) - database_cleaner-active_record (2.2.0) + database_cleaner-active_record (2.2.2) activerecord (>= 5.a) - database_cleaner-core (~> 2.0.0) + database_cleaner-core (~> 2.0) database_cleaner-core (2.0.1) date (3.4.1) - delayed_job (4.1.13) - activesupport (>= 3.0, < 9.0) - delayed_job_active_record (4.1.11) - activerecord (>= 3.0, < 9.0) + delayed_job (4.1.10) + activesupport (>= 3.0, < 8.0) + delayed_job_active_record (4.1.7) + activerecord (>= 3.0, < 8.0) delayed_job (>= 3.0, < 5) devise (4.9.4) bcrypt (~> 3.0) @@ -176,96 +179,117 @@ GEM warden (~> 1.2.3) devise_ichain_authenticatable (0.3.2) devise (>= 2.2) - diff-lcs (1.5.1) - docile (1.4.1) - dotenv (3.1.7) - dotenv-rails (3.1.7) - dotenv (= 3.1.7) - railties (>= 6.1) + diff-lcs (1.6.2) + docile (1.4.0) + domain_name (0.5.20190701) + unf (>= 0.0.5, < 1.0.0) + dotenv (2.7.6) + dotenv-rails (2.7.6) + dotenv (= 2.7.6) + railties (>= 3.2) + drb (2.2.3) + erb (5.0.2) erubi (1.13.1) - execjs (2.10.0) - factory_bot (6.5.0) + erubis (2.7.0) + execjs (2.8.1) + factory_bot (6.2.0) activesupport (>= 5.0.0) - factory_bot_rails (6.4.4) - factory_bot (~> 6.5) + factory_bot_rails (6.2.0) + factory_bot (~> 6.2.0) railties (>= 5.0.0) - faker (3.5.1) - i18n (>= 1.8.11, < 2) - faraday (2.12.2) - faraday-net_http (>= 2.0, < 3.5) - json - logger - faraday-follow_redirects (0.3.0) - faraday (>= 1, < 3) - faraday-multipart (1.0.4) - multipart-post (~> 2) - faraday-net_http (3.4.0) - net-http (>= 0.5.0) - fastimage (2.3.1) + faker (2.18.0) + i18n (>= 1.6, < 2) + faraday (1.7.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-net_http (1.0.1) + faraday-net_http_persistent (1.2.0) + faraday-patron (1.0.0) + faraday-rack (1.0.0) + fastimage (2.2.5) feature (1.4.0) - ffi (1.17.2) - font-awesome-sass (6.5.2) + ffi (1.15.3) + font-awesome-sass (6.7.2) sassc (~> 2.0) geckodriver-helper (0.24.0) archive-zip (~> 0.7) globalid (1.2.1) activesupport (>= 6.1) gravtastic (3.2.6) - haml (6.3.0) - temple (>= 0.8.2) - thor + haml (5.2.2) + temple (>= 0.8.0) tilt - haml-rails (2.1.0) + haml-rails (2.0.1) actionpack (>= 5.1) activesupport (>= 5.1) - haml (>= 4.0.6) + haml (>= 4.0.6, < 6.0) + html2haml (>= 1.0.1) railties (>= 5.1) - haml_lint (0.59.0) - haml (>= 5.0) + haml_lint (0.37.1) + haml (>= 4.0, < 5.3) parallel (~> 1.10) rainbow - rubocop (>= 1.0) + rubocop (>= 0.50.0) sysexits (~> 1.1) - hashdiff (1.2.0) + hashdiff (1.0.1) hashery (2.1.2) - hashie (5.0.0) + hashie (4.1.0) + html2haml (2.2.0) + erubis (~> 2.7.0) + haml (>= 4.0, < 6) + nokogiri (>= 1.6.0) + ruby_parser (~> 3.5) htmlentities (4.3.4) + http-accept (1.7.0) + http-cookie (1.0.4) + domain_name (~> 0.5) i18n (1.14.7) concurrent-ruby (~> 1.0) - i18n_data (1.1.0) - simple_po_parser (~> 1.1) - icalendar (2.10.3) + i18n_data (0.13.0) + icalendar (2.7.1) ice_cube (~> 0.16) - ostruct - ice_cube (0.17.0) - image_processing (1.13.0) + ice_cube (0.16.3) + image_processing (1.12.1) mini_magick (>= 4.9.5, < 5) ruby-vips (>= 2.0.17, < 3) + io-console (0.8.1) io-like (0.3.1) - iso-639 (0.3.8) - csv + irb (1.15.2) + pp (>= 0.6.0) + rdoc (>= 4.0.0) + reline (>= 0.4.2) + iso-639 (0.3.5) jquery-datatables-rails (3.4.0) actionpack (>= 3.1) jquery-rails railties (>= 3.1) sass-rails - jquery-rails (4.6.0) + jquery-rails (4.4.0) rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) - jquery-ui-rails (8.0.0) + jquery-ui-rails (6.0.1) railties (>= 3.2.16) json (2.13.2) - json-schema (5.2.1) - addressable (~> 2.8) - bigdecimal (~> 3.1) + json-schema (2.8.1) + addressable (>= 2.4) jsonapi-renderer (0.2.2) - jwt (2.9.3) - base64 + jwt (2.2.3) language_server-protocol (3.17.0.5) - launchy (3.0.1) + launchy (2.5.2) addressable (~> 2.8) - childprocess (~> 5.0) leaflet-rails (1.9.5) actionpack (>= 4.2.0) railties (>= 4.2.0) @@ -277,13 +301,13 @@ GEM railties (>= 6.1) rexml lint_roller (1.1.0) - logger (1.6.3) + logger (1.7.0) lograge (0.14.0) actionpack (>= 4) activesupport (>= 4) railties (>= 4) request_store (~> 1.0) - loofah (2.24.0) + loofah (2.24.1) crass (~> 1.0.2) nokogiri (>= 1.12.0) mail (2.8.1) @@ -293,28 +317,28 @@ GEM net-smtp marcel (1.0.4) matrix (0.4.2) - method_source (1.1.0) - mina (1.2.5) + mime-types (3.3.1) + mime-types-data (~> 3.2015) + mime-types-data (3.2021.0704) + mina (1.2.4) + open4 (~> 1.3.4) rake - mini_magick (4.13.2) + mini_magick (4.11.0) mini_mime (1.1.5) mini_portile2 (2.8.9) minitest (5.25.5) - monetize (1.13.0) + monetize (1.9.4) money (~> 6.12) - money (6.19.0) + money (6.13.8) i18n (>= 0.6.4, <= 2) - money-rails (1.15.0) + money-rails (1.14.0) activesupport (>= 3.0) - monetize (~> 1.9) - money (~> 6.13) + monetize (~> 1.9.0) + money (~> 6.13.2) railties (>= 3.0) multi_json (1.15.0) - multi_xml (0.7.1) - bigdecimal (~> 3.1) - multipart-post (2.4.1) - net-http (0.6.0) - uri + multi_xml (0.6.0) + multipart-post (2.1.1) net-imap (0.5.9) date net-protocol @@ -322,47 +346,46 @@ GEM net-protocol net-protocol (0.2.2) timeout - net-smtp (0.5.0) + net-smtp (0.5.1) net-protocol - next_rails (1.4.2) - rainbow (>= 3) + netrc (0.11.0) + next_rails (1.0.4) + colorize (>= 0.8.1) nio4r (2.7.4) nokogiri (1.18.9) mini_portile2 (~> 2.8.2) racc (~> 1.4) - oauth2 (2.0.9) - faraday (>= 0.17.3, < 3.0) + oauth2 (1.4.7) + faraday (>= 0.8, < 2.0) jwt (>= 1.0, < 3.0) + multi_json (~> 1.3) multi_xml (~> 0.5) - rack (>= 1.2, < 4) - snaky_hash (~> 2.0) - version_gem (~> 1.1) - omniauth (2.1.2) + rack (>= 1.2, < 3) + omniauth (2.0.4) hashie (>= 3.4.6) - rack (>= 2.2.3) + rack (>= 1.6.2, < 3) rack-protection - omniauth-facebook (10.0.0) - bigdecimal - omniauth-oauth2 (>= 1.2, < 3) - omniauth-github (2.0.1) + omniauth-facebook (8.0.0) + omniauth-oauth2 (~> 1.2) + omniauth-github (2.0.0) omniauth (~> 2.0) - omniauth-oauth2 (~> 1.8) - omniauth-google-oauth2 (1.2.0) - jwt (>= 2.9) - oauth2 (~> 2.0) - omniauth (~> 2.0) - omniauth-oauth2 (~> 1.8) - omniauth-oauth2 (1.8.0) - oauth2 (>= 1.4, < 3) + omniauth-oauth2 (~> 1.7.1) + omniauth-google-oauth2 (1.0.0) + jwt (>= 2.0) + oauth2 (~> 1.1) omniauth (~> 2.0) + omniauth-oauth2 (~> 1.7.1) + omniauth-oauth2 (1.7.1) + oauth2 (~> 1.4) + omniauth (>= 1.9, < 3) omniauth-openid (2.0.1) omniauth (>= 1.0, < 3.0) rack-openid (~> 1.4.0) - omniauth-rails_csrf_protection (1.0.2) + omniauth-rails_csrf_protection (1.0.0) actionpack (>= 4.2) omniauth (~> 2.0) + open4 (1.3.4) orm_adapter (0.5.0) - ostruct (0.6.1) paper_trail (16.0.0) activerecord (>= 6.1) request_store (~> 1.4) @@ -370,116 +393,136 @@ GEM parser (3.3.9.0) ast (~> 2.4.1) racc - pdf-core (0.10.0) + pdf-core (0.9.0) pdf-inspector (1.3.0) pdf-reader (>= 1.0, < 3.0.a) - pdf-reader (2.13.0) - Ascii85 (>= 1.0, < 3.0, != 2.0.0) + pdf-reader (2.5.0) + Ascii85 (~> 1.0) afm (~> 0.2.1) hashery (~> 2.0) ruby-rc4 ttfunk pg (1.6.1) - prawn (2.5.0) - matrix (~> 0.4) - pdf-core (~> 0.10.0) - ttfunk (~> 1.8) + pp (0.6.2) + prettyprint + prawn (2.4.0) + pdf-core (~> 0.9.0) + ttfunk (~> 1.7) prawn-qrcode (0.5.2) prawn (>= 1) rqrcode (>= 1.0.0) - prawn-rails (1.5.0) + prawn-rails (1.4.2) actionview (>= 3.1.0) - activesupport (>= 3.1.0) prawn prawn-table prawn-table (0.2.2) prawn (>= 1.3.0, < 3.0.0) + prettyprint (0.2.0) prism (1.4.0) + psych (5.2.6) + date + stringio public_suffix (6.0.2) - puma (6.5.0) + puma (4.3.8) nio4r (~> 2.0) racc (1.8.1) rack (2.2.17) rack-openid (1.4.2) rack (>= 1.1.0) ruby-openid (>= 2.1.8) - rack-protection (3.2.0) - base64 (>= 0.1.0) - rack (~> 2.2, >= 2.2.4) - rack-test (2.1.0) + rack-protection (2.1.0) + rack + rack-session (1.0.2) + rack (< 3) + rack-test (2.2.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 (1.0.1) + rack (< 3) + webrick + 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.0.8.4) + railties (= 7.2.2.1) rails-controller-testing (1.0.5) actionpack (>= 5.0.1.rc1) actionview (>= 5.0.1.rc1) activesupport (>= 5.0.1.rc1) - rails-dom-testing (2.2.0) + rails-dom-testing (2.3.0) activesupport (>= 5.0.0) minitest nokogiri (>= 1.6) 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) - rails-i18n (7.0.9) + rails-i18n (7.0.1) i18n (>= 0.7, < 2) railties (>= 6.0.0, < 8) - railties (7.0.8.4) - actionpack (= 7.0.8.4) - activesupport (= 7.0.8.4) - method_source + 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) - zeitwerk (~> 2.5) + thor (~> 1.0, >= 1.2.2) + zeitwerk (~> 2.6) rainbow (3.1.1) - rake (13.2.1) - recaptcha (5.18.0) - redcarpet (3.6.0) + rake (13.3.0) + rdoc (6.14.2) + erb + psych (>= 4.0.0) + recaptcha (5.8.1) + json + redcarpet (3.5.1) regexp_parser (2.11.1) + reline (0.6.2) + io-console (~> 0.5) request_store (1.7.0) rack (>= 1.4) responders (3.1.1) actionpack (>= 5.2) railties (>= 5.2) + rest-client (2.1.0) + http-accept (>= 1.7.0, < 2.0) + http-cookie (>= 1.0.2, < 2.0) + mime-types (>= 1.16, < 4.0) + netrc (~> 0.8) rexml (3.4.1) - rolify (6.0.1) - rqrcode (2.2.0) + rolify (6.0.0) + rqrcode (2.0.0) chunky_png (~> 1.0) rqrcode_core (~> 1.0) - rqrcode_core (1.2.0) - rspec-activemodel-mocks (1.2.1) + rqrcode_core (1.1.0) + rspec-activemodel-mocks (1.1.0) activemodel (>= 3.0) activesupport (>= 3.0) rspec-mocks (>= 2.99, < 4.0) - rspec-core (3.13.2) + rspec-core (3.13.5) rspec-support (~> 3.13.0) - rspec-expectations (3.13.3) + rspec-expectations (3.13.5) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.13.0) - rspec-mocks (3.13.2) + rspec-mocks (3.13.5) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.13.0) - rspec-rails (7.1.0) - actionpack (>= 7.0) - activesupport (>= 7.0) - railties (>= 7.0) + rspec-rails (8.0.2) + actionpack (>= 7.2) + activesupport (>= 7.2) + railties (>= 7.2) rspec-core (~> 3.13) rspec-expectations (~> 3.13) rspec-mocks (~> 3.13) rspec-support (~> 3.13) - rspec-support (3.13.2) + rspec-support (3.13.4) rubocop (1.79.2) json (~> 2.3) language_server-protocol (~> 3.17.0.2) @@ -517,14 +560,16 @@ GEM lint_roller (~> 1.1) rubocop (~> 1.72, >= 1.72.1) rubocop-rspec (~> 3.5) - ruby-oembed (0.18.1) + ruby-oembed (0.15.0) ruby-openid (2.9.2) ruby-progressbar (1.13.0) ruby-rc4 (0.1.5) - ruby-vips (2.2.2) + ruby-vips (2.1.2) ffi (~> 1.12) - logger - rubyzip (2.3.2) + ruby2_keywords (0.0.5) + ruby_parser (3.17.0) + sexp_processor (~> 4.15, >= 4.15.1) + rubyzip (2.4.1) sass-rails (6.0.0) sassc-rails (~> 2.1, >= 2.1.1) sassc (2.4.0) @@ -535,71 +580,70 @@ GEM sprockets (> 3.0) sprockets-rails tilt + securerandom (0.4.1) selectize-rails (0.12.6) selenium-webdriver (4.10.0) rexml (~> 3.2, >= 3.2.5) rubyzip (>= 1.2.2, < 3.0) websocket (~> 1.0) - sentry-rails (5.22.0) + sentry-rails (4.6.5) railties (>= 5.0) - sentry-ruby (~> 5.22.0) - sentry-ruby (5.22.0) - bigdecimal - concurrent-ruby (~> 1.0, >= 1.0.2) - shoulda-matchers (6.4.0) - activesupport (>= 5.2.0) - simple_po_parser (1.1.6) - simplecov (0.22.0) + sentry-ruby-core (~> 4.6.0) + sentry-ruby-core (4.6.5) + concurrent-ruby + faraday + sexp_processor (4.15.3) + shoulda-matchers (4.5.1) + activesupport (>= 4.2.0) + simplecov (0.21.2) docile (~> 1.1) simplecov-html (~> 0.11) simplecov_json_formatter (~> 0.1) - simplecov-cobertura (2.1.0) - rexml - simplecov (~> 0.19) - simplecov-html (0.13.1) - simplecov_json_formatter (0.1.4) - snaky_hash (2.0.1) - hashie - version_gem (~> 1.1, >= 1.1.1) - sprockets (4.2.1) + simplecov-cobertura (1.4.2) + simplecov (~> 0.8) + simplecov-html (0.12.3) + simplecov_json_formatter (0.1.3) + sprockets (4.0.2) concurrent-ruby (~> 1.0) - rack (>= 2.2.4, < 4) - sprockets-rails (3.5.2) - actionpack (>= 6.1) - activesupport (>= 6.1) + rack (> 1, < 3) + sprockets-rails (3.2.2) + actionpack (>= 4.0) + activesupport (>= 4.0) sprockets (>= 3.0.0) - ssrf_filter (1.2.0) - stripe (5.55.0) - stripe-ruby-mock (3.1.0) + ssrf_filter (1.0.7) + stringio (3.1.7) + stripe (5.43.0) + stripe-ruby-mock (3.1.0.rc3) dante (>= 0.2.0) multi_json (~> 1.0) stripe (> 5, < 6) sysexits (1.2.0) - temple (0.10.3) + temple (0.8.2) thor (1.4.0) - tilt (2.4.0) - timecop (0.9.10) + tilt (2.0.10) + timecop (0.9.4) timeout (0.4.3) - transitions (1.3.0) - ttfunk (1.8.0) - bigdecimal (~> 3.1) + transitions (1.2.1) + ttfunk (1.7.0) turbolinks (5.2.1) turbolinks-source (~> 5.2) turbolinks-source (5.2.0) tzinfo (2.0.6) concurrent-ruby (~> 1.0) - uglifier (4.2.1) + uglifier (4.2.0) execjs (>= 0.3.0, < 3) + unf (0.1.4) + unf_ext + unf_ext (0.0.7.7) unicode-display_width (3.1.4) unicode-emoji (~> 4.0, >= 4.0.4) unicode-emoji (4.0.4) unobtrusive_flash (3.3.1) railties - uri (1.0.3) - version_gem (1.1.4) + useragent (0.16.11) warden (1.2.9) rack (>= 2.0.9) - web-console (4.2.1) + web-console (4.1.0) actionview (>= 6.0.0) activemodel (>= 6.0.0) bindex (>= 0.4.0) @@ -608,19 +652,21 @@ GEM nokogiri (~> 1.6) rubyzip (>= 1.3.0) selenium-webdriver (~> 4.0, < 4.11) - webmock (3.25.1) + webmock (3.14.0) addressable (>= 2.8.0) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) + webrick (1.9.1) websocket (1.2.11) - websocket-driver (0.7.6) + websocket-driver (0.8.0) + base64 websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) whenever (1.0.0) chronic (>= 0.6.3) xpath (3.2.0) nokogiri (~> 1.8) - zeitwerk (2.7.1) + zeitwerk (2.7.3) PLATFORMS ruby @@ -644,7 +690,6 @@ DEPENDENCIES climate_control cloudinary cocoon - concurrent-ruby (= 1.3.4) countable-rails daemons dalli @@ -689,7 +734,7 @@ DEPENDENCIES prawn-qrcode prawn-rails puma - rails (~> 7.0) + rails (~> 7.2) rails-controller-testing rails-i18n recaptcha @@ -727,7 +772,7 @@ DEPENDENCIES whenever RUBY VERSION - ruby 3.3.7 + ruby 3.3.9 BUNDLED WITH - 2.5.9 + 2.5.22 diff --git a/Gemfile.next.lock b/Gemfile.next.lock index 0e8acc2e..b56f6e82 100644 --- a/Gemfile.next.lock +++ b/Gemfile.next.lock @@ -1,135 +1,119 @@ -GEM - remote: https://rails-assets.org/ - specs: - rails-assets-bootstrap (3.4.1) - rails-assets-jquery (>= 1.9.1, < 4) - rails-assets-bootstrap-markdown (2.10.0) - rails-assets-bootstrap (~> 3) - rails-assets-bootstrap-select (1.13.10) - rails-assets-bootstrap (>= 3.0.0) - rails-assets-jquery (>= 1.9.1, < 4) - rails-assets-date.format (1.2.3) - rails-assets-holderjs (2.9.6) - rails-assets-jquery (3.4.1) - rails-assets-jquery-smooth-scroll (2.2.0) - rails-assets-jquery (>= 1.7.0) - rails-assets-markdown (0.5.0) - rails-assets-momentjs (2.22.2) - rails-assets-spectrum (1.8.0) - rails-assets-jquery (>= 1.7.2) - rails-assets-tinycolor (1.4.1) - rails-assets-to-markdown (3.1.1) - rails-assets-trianglify (1.2.0) - rails-assets-waypoints (4.0.1) - GEM remote: https://rubygems.org/ specs: Ascii85 (1.1.0) - actioncable (7.0.1) - actionpack (= 7.0.1) - activesupport (= 7.0.1) + actioncable (8.0.2) + actionpack (= 8.0.2) + activesupport (= 8.0.2) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (7.0.1) - actionpack (= 7.0.1) - activejob (= 7.0.1) - activerecord (= 7.0.1) - activestorage (= 7.0.1) - activesupport (= 7.0.1) - mail (>= 2.7.1) - net-imap - net-pop - net-smtp - actionmailer (7.0.1) - actionpack (= 7.0.1) - actionview (= 7.0.1) - activejob (= 7.0.1) - activesupport (= 7.0.1) - mail (~> 2.5, >= 2.5.4) - net-imap - net-pop - net-smtp - rails-dom-testing (~> 2.0) - actionpack (7.0.1) - actionview (= 7.0.1) - activesupport (= 7.0.1) - rack (~> 2.0, >= 2.2.0) + zeitwerk (~> 2.6) + actionmailbox (8.0.2) + actionpack (= 8.0.2) + activejob (= 8.0.2) + activerecord (= 8.0.2) + activestorage (= 8.0.2) + activesupport (= 8.0.2) + mail (>= 2.8.0) + actionmailer (8.0.2) + actionpack (= 8.0.2) + actionview (= 8.0.2) + activejob (= 8.0.2) + activesupport (= 8.0.2) + mail (>= 2.8.0) + rails-dom-testing (~> 2.2) + actionpack (8.0.2) + actionview (= 8.0.2) + activesupport (= 8.0.2) + nokogiri (>= 1.8.5) + 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.1) - actionpack (= 7.0.1) - activerecord (= 7.0.1) - activestorage (= 7.0.1) - activesupport (= 7.0.1) + rails-dom-testing (~> 2.2) + rails-html-sanitizer (~> 1.6) + useragent (~> 0.16) + actiontext (8.0.2) + actionpack (= 8.0.2) + activerecord (= 8.0.2) + activestorage (= 8.0.2) + activesupport (= 8.0.2) globalid (>= 0.6.0) nokogiri (>= 1.8.5) - actionview (7.0.1) - activesupport (= 7.0.1) + actionview (8.0.2) + activesupport (= 8.0.2) builder (~> 3.1) - erubi (~> 1.4) - rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.1, >= 1.2.0) - active_model_serializers (0.10.13) - actionpack (>= 4.1, < 7.1) - activemodel (>= 4.1, < 7.1) + erubi (~> 1.11) + rails-dom-testing (~> 2.2) + rails-html-sanitizer (~> 1.6) + active_model_serializers (0.10.15) + actionpack (>= 4.1) + activemodel (>= 4.1) case_transform (>= 0.2) jsonapi-renderer (>= 0.1.1.beta1, < 0.3) - activejob (7.0.1) - activesupport (= 7.0.1) + activejob (8.0.2) + activesupport (= 8.0.2) globalid (>= 0.3.6) - activemodel (7.0.1) - activesupport (= 7.0.1) - activerecord (7.0.1) - activemodel (= 7.0.1) - activesupport (= 7.0.1) - activestorage (7.0.1) - actionpack (= 7.0.1) - activejob (= 7.0.1) - activerecord (= 7.0.1) - activesupport (= 7.0.1) + activemodel (8.0.2) + activesupport (= 8.0.2) + activerecord (8.0.2) + activemodel (= 8.0.2) + activesupport (= 8.0.2) + timeout (>= 0.4.0) + activestorage (8.0.2) + actionpack (= 8.0.2) + activejob (= 8.0.2) + activerecord (= 8.0.2) + activesupport (= 8.0.2) marcel (~> 1.0) - mini_mime (>= 1.1.0) - activesupport (7.0.1) - concurrent-ruby (~> 1.0, >= 1.0.2) + activesupport (8.0.2) + base64 + benchmark (>= 0.3) + bigdecimal + concurrent-ruby (~> 1.0, >= 1.3.1) + connection_pool (>= 2.2.5) + drb i18n (>= 1.6, < 2) + logger (>= 1.4.2) minitest (>= 5.1) - tzinfo (~> 2.0) + securerandom (>= 0.3) + tzinfo (~> 2.0, >= 2.0.5) + uri (>= 0.13.1) acts_as_commentable_with_threading (1.2.0) activerecord (>= 3.0) activesupport (>= 3.0) awesome_nested_set (>= 2.0) acts_as_list (1.0.4) activerecord (>= 4.2) - addressable (2.8.0) - public_suffix (>= 2.0.2, < 5.0) + addressable (2.8.7) + public_suffix (>= 2.0.2, < 7.0) afm (0.2.2) ajax-datatables-rails (1.3.1) zeitwerk archive-zip (0.12.0) io-like (~> 0.3.0) - ast (2.4.2) + ast (2.4.3) autoprefixer-rails (10.3.1.0) execjs (~> 2) - awesome_nested_set (3.5.0) - activerecord (>= 4.0.0, < 7.1) + awesome_nested_set (3.8.0) + activerecord (>= 4.0.0, < 8.1) aws_cf_signer (0.1.3) - bcrypt (3.1.16) + base64 (0.3.0) + bcrypt (3.1.20) + benchmark (0.4.1) + bigdecimal (3.2.2) bindex (0.8.1) bootstrap-sass (3.4.1) autoprefixer-rails (>= 5.2.1) sassc (>= 2.0.0) - bootstrap-switch-rails (3.3.5) - bootstrap3-datetimepicker-rails (4.17.47) - momentjs-rails (>= 2.8.1) - builder (3.2.4) + bootstrap-switch-rails (3.3.3) + builder (3.3.0) byebug (11.1.3) cancancan (3.3.0) - capybara (3.35.3) + capybara (3.40.0) addressable + matrix mini_mime (>= 0.1.3) - nokogiri (~> 1.8) + nokogiri (~> 1.11) rack (>= 1.6.0) rack-test (>= 0.6.3) regexp_parser (>= 1.5, < 3.0) @@ -157,7 +141,8 @@ GEM actionpack (>= 3.1) caxlsx (>= 3.0) chartkick (4.1.3) - childprocess (3.0.0) + childprocess (5.1.0) + logger (~> 1.5) chronic (0.10.2) chunky_png (1.4.0) climate_control (1.0.1) @@ -166,33 +151,29 @@ GEM rest-client (>= 2.0.0) cocoon (1.2.15) colorize (0.8.1) - concurrent-ruby (1.1.9) + concurrent-ruby (1.3.5) + connection_pool (2.5.3) countable-rails (0.0.1) railties (>= 3.1) - countries (4.0.1) - i18n_data (~> 0.13.0) - sixarm_ruby_unaccent (~> 1.1) - country_select (6.0.0) - countries (~> 4.0) - sort_alphabetical (~> 1.1) crack (0.4.5) rexml crass (1.0.6) daemons (1.4.0) dalli (2.7.11) dante (0.2.0) - database_cleaner (2.0.1) - database_cleaner-active_record (~> 2.0.0) - database_cleaner-active_record (2.0.1) + database_cleaner (2.1.0) + database_cleaner-active_record (>= 2, < 3) + database_cleaner-active_record (2.2.2) activerecord (>= 5.a) - database_cleaner-core (~> 2.0.0) + database_cleaner-core (~> 2.0) database_cleaner-core (2.0.1) - delayed_job (4.1.10) - activesupport (>= 3.0, < 8.0) - delayed_job_active_record (4.1.7) - activerecord (>= 3.0, < 8.0) + date (3.4.1) + delayed_job (4.1.13) + activesupport (>= 3.0, < 9.0) + delayed_job_active_record (4.1.11) + activerecord (>= 3.0, < 9.0) delayed_job (>= 3.0, < 5) - devise (4.8.1) + devise (4.9.4) bcrypt (~> 3.0) orm_adapter (~> 0.1) railties (>= 4.1.0) @@ -200,8 +181,7 @@ GEM warden (~> 1.2.3) devise_ichain_authenticatable (0.3.2) devise (>= 2.2) - diff-lcs (1.4.4) - digest (3.1.0) + diff-lcs (1.6.2) docile (1.4.0) domain_name (0.5.20190701) unf (>= 0.0.5, < 1.0.0) @@ -209,7 +189,9 @@ GEM dotenv-rails (2.7.6) dotenv (= 2.7.6) railties (>= 3.2) - erubi (1.10.0) + drb (2.2.3) + erb (5.0.2) + erubi (1.13.1) erubis (2.7.0) execjs (2.8.1) factory_bot (6.2.0) @@ -241,12 +223,12 @@ GEM fastimage (2.2.5) feature (1.4.0) ffi (1.15.3) - font-awesome-rails (4.7.0.8) - railties (>= 3.2, < 8.0) + font-awesome-sass (6.7.2) + sassc (~> 2.0) geckodriver-helper (0.24.0) archive-zip (~> 0.7) - globalid (1.0.0) - activesupport (>= 5.0) + globalid (1.2.1) + activesupport (>= 6.1) gravtastic (3.2.6) haml (5.2.2) temple (>= 0.8.0) @@ -275,7 +257,7 @@ GEM http-accept (1.7.0) http-cookie (1.0.4) domain_name (~> 0.5) - i18n (1.9.1) + i18n (1.14.7) concurrent-ruby (~> 1.0) i18n_data (0.13.0) icalendar (2.7.1) @@ -284,8 +266,12 @@ GEM image_processing (1.12.1) mini_magick (>= 4.9.5, < 5) ruby-vips (>= 2.0.17, < 3) + io-console (0.8.1) io-like (0.3.1) - io-wait (0.2.1) + irb (1.15.2) + pp (>= 0.6.0) + rdoc (>= 4.0.0) + reline (>= 0.4.2) iso-639 (0.3.5) jquery-datatables-rails (3.4.0) actionpack (>= 3.1) @@ -303,25 +289,38 @@ GEM addressable (>= 2.4) jsonapi-renderer (0.2.2) jwt (2.2.3) - launchy (2.5.0) - addressable (~> 2.7) - leaflet-rails (1.7.0) - rails (>= 4.2.0) - letter_opener (1.7.0) - launchy (~> 2.2) - letter_opener_web (2.0.0) - actionmailer (>= 5.2) - letter_opener (~> 1.7) - railties (>= 5.2) + language_server-protocol (3.17.0.5) + launchy (3.1.1) + addressable (~> 2.8) + childprocess (~> 5.0) + logger (~> 1.6) + leaflet-rails (1.9.5) + actionpack (>= 4.2.0) + railties (>= 4.2.0) + letter_opener (1.10.0) + launchy (>= 2.2, < 4) + letter_opener_web (3.0.0) + actionmailer (>= 6.1) + letter_opener (~> 1.9) + railties (>= 6.1) rexml - loofah (2.13.0) + lint_roller (1.1.0) + logger (1.7.0) + lograge (0.14.0) + actionpack (>= 4) + activesupport (>= 4) + railties (>= 4) + request_store (~> 1.0) + loofah (2.24.1) crass (~> 1.0.2) - nokogiri (>= 1.5.9) - mail (2.7.1) + nokogiri (>= 1.12.0) + mail (2.8.1) mini_mime (>= 0.1.1) - marcel (1.0.1) + net-imap + net-pop + net-smtp + marcel (1.0.4) matrix (0.4.2) - method_source (1.0.0) mime-types (3.3.1) mime-types-data (~> 3.2015) mime-types-data (3.2021.0704) @@ -329,11 +328,9 @@ GEM open4 (~> 1.3.4) rake mini_magick (4.11.0) - mini_mime (1.1.2) - mini_portile2 (2.7.1) - minitest (5.15.0) - momentjs-rails (2.20.1) - railties (>= 3.1) + mini_mime (1.1.5) + mini_portile2 (2.8.9) + minitest (5.25.5) monetize (1.9.4) money (~> 6.12) money (6.13.8) @@ -346,28 +343,21 @@ GEM multi_json (1.15.0) multi_xml (0.6.0) multipart-post (2.1.1) - mysql2 (0.5.3) - net-imap (0.2.3) - digest + net-imap (0.5.9) + date net-protocol - strscan - net-pop (0.1.1) - digest + net-pop (0.1.2) net-protocol + net-protocol (0.2.2) timeout - net-protocol (0.1.2) - io-wait - timeout - net-smtp (0.3.1) - digest + net-smtp (0.5.1) net-protocol - timeout netrc (0.11.0) next_rails (1.0.4) colorize (>= 0.8.1) - nio4r (2.5.8) - nokogiri (1.13.1) - mini_portile2 (~> 2.7.0) + nio4r (2.7.4) + nokogiri (1.18.9) + mini_portile2 (~> 2.8.2) racc (~> 1.4) oauth2 (1.4.7) faraday (>= 0.8, < 2.0) @@ -400,12 +390,13 @@ GEM omniauth (~> 2.0) open4 (1.3.4) orm_adapter (0.5.0) - paper_trail (12.2.0) - activerecord (>= 5.2) - request_store (~> 1.1) - parallel (1.21.0) - parser (3.1.0.0) + paper_trail (16.0.0) + activerecord (>= 6.1) + request_store (~> 1.4) + parallel (1.27.0) + parser (3.3.9.0) ast (~> 2.4.1) + racc pdf-core (0.9.0) pdf-inspector (1.3.0) pdf-reader (>= 1.0, < 3.0.a) @@ -415,7 +406,9 @@ GEM hashery (~> 2.0) ruby-rc4 ttfunk - pg (1.2.3) + pg (1.6.1) + pp (0.6.2) + prettyprint prawn (2.4.0) pdf-core (~> 0.9.0) ttfunk (~> 1.7) @@ -428,68 +421,86 @@ GEM prawn-table prawn-table (0.2.2) prawn (>= 1.3.0, < 3.0.0) - public_suffix (4.0.6) + prettyprint (0.2.0) + prism (1.4.0) + psych (5.2.6) + date + stringio + public_suffix (6.0.2) puma (4.3.8) nio4r (~> 2.0) - racc (1.6.0) - rack (2.2.3) + racc (1.8.1) + rack (2.2.17) rack-openid (1.4.2) rack (>= 1.1.0) ruby-openid (>= 2.1.8) rack-protection (2.1.0) rack - rack-test (1.1.0) - rack (>= 1.0, < 3) - rails (7.0.1) - actioncable (= 7.0.1) - actionmailbox (= 7.0.1) - actionmailer (= 7.0.1) - actionpack (= 7.0.1) - actiontext (= 7.0.1) - actionview (= 7.0.1) - activejob (= 7.0.1) - activemodel (= 7.0.1) - activerecord (= 7.0.1) - activestorage (= 7.0.1) - activesupport (= 7.0.1) + rack-session (1.0.2) + rack (< 3) + rack-test (2.2.0) + rack (>= 1.3) + rackup (1.0.1) + rack (< 3) + webrick + rails (8.0.2) + actioncable (= 8.0.2) + actionmailbox (= 8.0.2) + actionmailer (= 8.0.2) + actionpack (= 8.0.2) + actiontext (= 8.0.2) + actionview (= 8.0.2) + activejob (= 8.0.2) + activemodel (= 8.0.2) + activerecord (= 8.0.2) + activestorage (= 8.0.2) + activesupport (= 8.0.2) bundler (>= 1.15.0) - railties (= 7.0.1) + railties (= 8.0.2) rails-controller-testing (1.0.5) actionpack (>= 5.0.1.rc1) actionview (>= 5.0.1.rc1) activesupport (>= 5.0.1.rc1) - rails-dom-testing (2.0.3) - activesupport (>= 4.2.0) + rails-dom-testing (2.3.0) + activesupport (>= 5.0.0) + minitest nokogiri (>= 1.6) - rails-html-sanitizer (1.4.2) - loofah (~> 2.3) - rails-i18n (7.0.1) + 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) + rails-i18n (8.0.1) i18n (>= 0.7, < 2) - railties (>= 6.0.0, < 8) - railties (7.0.1) - actionpack (= 7.0.1) - activesupport (= 7.0.1) - method_source + railties (>= 8.0.0, < 9) + railties (8.0.2) + actionpack (= 8.0.2) + activesupport (= 8.0.2) + irb (~> 1.13) + 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.0.6) + rake (13.3.0) + rdoc (6.14.2) + erb + psych (>= 4.0.0) recaptcha (5.8.1) json redcarpet (3.5.1) - regexp_parser (2.2.0) - request_store (1.5.1) + regexp_parser (2.11.1) + reline (0.6.2) + io-console (~> 0.5) + request_store (1.7.0) rack (>= 1.4) - responders (3.0.1) - actionpack (>= 5.0) - railties (>= 5.0) + responders (3.1.1) + actionpack (>= 5.2) + railties (>= 5.2) rest-client (2.1.0) http-accept (>= 1.7.0, < 2.0) http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 4.0) netrc (~> 0.8) - rexml (3.2.5) + rexml (3.4.1) rolify (6.0.0) rqrcode (2.0.0) chunky_png (~> 1.0) @@ -499,34 +510,47 @@ GEM activemodel (>= 3.0) activesupport (>= 3.0) rspec-mocks (>= 2.99, < 4.0) - rspec-core (3.10.1) - rspec-support (~> 3.10.0) - rspec-expectations (3.10.1) + rspec-core (3.13.5) + rspec-support (~> 3.13.0) + rspec-expectations (3.13.5) 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.5) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.10.0) - rspec-rails (5.0.2) - actionpack (>= 5.2) - activesupport (>= 5.2) - railties (>= 5.2) - rspec-core (~> 3.10) - rspec-expectations (~> 3.10) - rspec-mocks (~> 3.10) - rspec-support (~> 3.10) - rspec-support (3.10.2) - rubocop (1.25.1) + rspec-support (~> 3.13.0) + rspec-rails (8.0.2) + actionpack (>= 7.2) + activesupport (>= 7.2) + railties (>= 7.2) + rspec-core (~> 3.13) + rspec-expectations (~> 3.13) + rspec-mocks (~> 3.13) + rspec-support (~> 3.13) + rspec-support (3.13.4) + rubocop (1.79.2) + json (~> 2.3) + language_server-protocol (~> 3.17.0.2) + lint_roller (~> 1.1.0) parallel (~> 1.10) - parser (>= 3.1.0.0) + parser (>= 3.3.0.2) rainbow (>= 2.2.2, < 4.0) - regexp_parser (>= 1.8, < 3.0) - rexml - rubocop-ast (>= 1.15.1, < 2.0) + regexp_parser (>= 2.9.3, < 3.0) + rubocop-ast (>= 1.46.0, < 2.0) ruby-progressbar (~> 1.7) - unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.15.1) - parser (>= 3.0.1.1) + unicode-display_width (>= 2.4.0, < 4.0) + rubocop-ast (1.46.0) + parser (>= 3.3.7.2) + prism (~> 1.4) + rubocop-capybara (2.22.1) + lint_roller (~> 1.1) + rubocop (~> 1.72, >= 1.72.1) + rubocop-factory_bot (2.27.1) + lint_roller (~> 1.1) + rubocop (~> 1.72, >= 1.72.1) + rubocop-performance (1.25.0) + lint_roller (~> 1.1) + rubocop (>= 1.75.0, < 2.0) + rubocop-ast (>= 1.38.0, < 2.0) rubocop-rails (2.11.3) activesupport (>= 4.2.0) rack (>= 1.1) @@ -534,16 +558,18 @@ GEM rubocop-rspec (2.4.0) rubocop (~> 1.0) rubocop-ast (>= 1.1.0) + rubocop-rspec_rails (2.29.1) + rubocop (~> 1.61) ruby-oembed (0.15.0) ruby-openid (2.9.2) - ruby-progressbar (1.11.0) + ruby-progressbar (1.13.0) ruby-rc4 (0.1.5) ruby-vips (2.1.2) ffi (~> 1.12) ruby2_keywords (0.0.5) ruby_parser (3.17.0) sexp_processor (~> 4.15, >= 4.15.1) - rubyzip (2.3.2) + rubyzip (2.4.1) sass-rails (6.0.0) sassc-rails (~> 2.1, >= 2.1.1) sassc (2.4.0) @@ -554,10 +580,12 @@ GEM sprockets (> 3.0) sprockets-rails tilt + securerandom (0.4.1) selectize-rails (0.12.6) - selenium-webdriver (3.142.7) - childprocess (>= 0.5, < 4.0) - rubyzip (>= 1.2.2) + selenium-webdriver (4.10.0) + rexml (~> 3.2, >= 3.2.5) + rubyzip (>= 1.2.2, < 3.0) + websocket (~> 1.0) sentry-rails (4.6.5) railties (>= 5.0) sentry-ruby-core (~> 4.6.0) @@ -575,11 +603,6 @@ GEM simplecov (~> 0.8) simplecov-html (0.12.3) simplecov_json_formatter (0.1.3) - sixarm_ruby_unaccent (1.2.0) - skylight (5.1.0) - activesupport (>= 5.2.0) - sort_alphabetical (1.1.0) - unicode_utils (>= 1.2.2) sprockets (4.0.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) @@ -587,36 +610,38 @@ GEM actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) - sqlite3 (1.4.2) ssrf_filter (1.0.7) + stringio (3.1.7) stripe (5.43.0) stripe-ruby-mock (3.1.0.rc3) dante (>= 0.2.0) multi_json (~> 1.0) stripe (> 5, < 6) - strscan (3.0.1) sysexits (1.2.0) temple (0.8.2) - thor (1.2.1) + thor (1.4.0) tilt (2.0.10) timecop (0.9.4) - timeout (0.2.0) + timeout (0.4.3) transitions (1.2.1) ttfunk (1.7.0) turbolinks (5.2.1) turbolinks-source (~> 5.2) turbolinks-source (5.2.0) - tzinfo (2.0.4) + tzinfo (2.0.6) concurrent-ruby (~> 1.0) uglifier (4.2.0) execjs (>= 0.3.0, < 3) unf (0.1.4) unf_ext unf_ext (0.0.7.7) - unicode-display_width (2.1.0) - unicode_utils (1.4.0) + unicode-display_width (3.1.4) + unicode-emoji (~> 4.0, >= 4.0.4) + unicode-emoji (4.0.4) unobtrusive_flash (3.3.1) railties + uri (1.0.3) + useragent (0.16.11) warden (1.2.9) rack (>= 2.0.9) web-console (4.1.0) @@ -624,22 +649,25 @@ GEM activemodel (>= 6.0.0) bindex (>= 0.4.0) railties (>= 6.0.0) - webdrivers (4.6.0) + webdrivers (5.3.1) nokogiri (~> 1.6) rubyzip (>= 1.3.0) - selenium-webdriver (>= 3.0, < 4.0) + selenium-webdriver (~> 4.0, < 4.11) webmock (3.14.0) addressable (>= 2.8.0) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) - websocket-driver (0.7.5) + webrick (1.9.1) + websocket (1.2.11) + websocket-driver (0.8.0) + base64 websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) whenever (1.0.0) chronic (>= 0.6.3) xpath (3.2.0) nokogiri (~> 1.8) - zeitwerk (2.5.4) + zeitwerk (2.7.3) PLATFORMS ruby @@ -652,8 +680,7 @@ DEPENDENCIES autoprefixer-rails awesome_nested_set bootstrap-sass (~> 3.4.0) - bootstrap-switch-rails (~> 3.3.5) - bootstrap3-datetimepicker-rails (~> 4.17.47) + bootstrap-switch-rails (= 3.3.3) byebug cancancan capybara @@ -665,7 +692,6 @@ DEPENDENCIES cloudinary cocoon countable-rails - country_select daemons dalli database_cleaner @@ -676,27 +702,27 @@ DEPENDENCIES factory_bot_rails faker feature - font-awesome-rails + font-awesome-sass geckodriver-helper gravtastic haml-rails haml_lint + i18n_data icalendar iso-639 jquery-datatables-rails jquery-rails - jquery-ui-rails (~> 6.0.1) + jquery-ui-rails json-schema leaflet-rails letter_opener letter_opener_web + lograge matrix (~> 0.4) mina mini_magick money-rails - mysql2 next_rails - nokogiri (>= 1.8.1) omniauth omniauth-facebook omniauth-github @@ -708,41 +734,32 @@ DEPENDENCIES pg prawn-qrcode prawn-rails - puma (~> 4.3) - rails (~> 7) - rails-assets-bootstrap-markdown! - rails-assets-bootstrap-select! - rails-assets-date.format! - rails-assets-holderjs! - rails-assets-jquery-smooth-scroll! - rails-assets-markdown! - rails-assets-momentjs! - rails-assets-spectrum! - rails-assets-tinycolor! - rails-assets-to-markdown (~> 3)! - rails-assets-trianglify! - rails-assets-waypoints! + puma + rails (~> 8.0) rails-controller-testing rails-i18n recaptcha redcarpet responders (~> 3.0) + rexml rolify rqrcode rspec-activemodel-mocks rspec-rails rubocop + rubocop-capybara + rubocop-factory_bot + rubocop-performance rubocop-rails rubocop-rspec + rubocop-rspec_rails ruby-oembed sass-rails (>= 4.0.2) selectize-rails sentry-rails shoulda-matchers simplecov-cobertura - skylight sprockets-rails - sqlite3 stripe stripe-ruby-mock (~> 3.1.0.rc3) timecop @@ -756,7 +773,7 @@ DEPENDENCIES whenever RUBY VERSION - ruby 3.1.0 + ruby 3.3.9p170 BUNDLED WITH 2.3.3 diff --git a/app/lib/rails_version.rb b/app/lib/rails_version.rb index 415b141f..167871aa 100644 --- a/app/lib/rails_version.rb +++ b/app/lib/rails_version.rb @@ -9,6 +9,6 @@ # Matching on major and minor versions should be enough for most migrations. module RailsVersion def self.next? - Rails::VERSION::MAJOR == 7 && Rails::VERSION::MINOR == 2 + Rails::VERSION::MAJOR == 8 && Rails::VERSION::MINOR == 0 end end diff --git a/app/models/conference.rb b/app/models/conference.rb index 46505572..6efd70b0 100644 --- a/app/models/conference.rb +++ b/app/models/conference.rb @@ -4,7 +4,9 @@ class Conference < ApplicationRecord include RevisionCount require 'uri' - serialize :events_per_week, Hash + + serialize :events_per_week, type: Hash + # Needed to call 'Conference.with_role' in /models/ability.rb # Dependent destroy will fail as roles#destroy will be cancelled,hence delete_all resourcify :roles, dependent: :delete_all @@ -826,7 +828,7 @@ class Conference < ApplicationRecord unless result[state.to_s.capitalize] result[state.to_s.capitalize] = {} end - result[state.to_s.capitalize][week.strftime('%W').to_i] = value + result[state.to_s.capitalize][DateTime.parse(week).strftime('%W').to_i] = value end end end diff --git a/config/application.rb b/config/application.rb index fc72c02c..3dee15b9 100644 --- a/config/application.rb +++ b/config/application.rb @@ -36,6 +36,6 @@ module Osem # This is a nightmare with our current data model, no one ever thought about this. config.active_record.belongs_to_required_by_default = false # https://discuss.rubyonrails.org/t/cve-2022-32224-possible-rce-escalation-bug-with-serialized-columns-in-active-record/81017 - config.active_record.yaml_column_permitted_classes = ['Date', 'DateTime', 'Symbol', 'Time', 'ActiveSupport::TimeWithZone', 'ActiveSupport::TimeZone'] + config.active_record.yaml_column_permitted_classes = [Date, DateTime, Symbol, Time, ActiveSupport::TimeWithZone, ActiveSupport::TimeZone] end end