Rails 6.0.6.1 upgrade

.ruby-version

@@ -1 +1 @@
-2.6.3
+3.3.0

Gemfile

@@ -1,6 +1,6 @@
 source "https://rubygems.org"
 
-gem "rails", "~> 5.2.7"
+gem "rails", "~> 6.0.0"
 gem "bootsnap"
 gem "sprockets", "< 4"
 
@@ -11,7 +11,6 @@ gem "sass-rails"
 
 gem "uglifier"
 gem "coffee-rails"
-gem "mini_racer", platforms: :ruby
 gem "jquery-rails"
 
 gem "slim-rails"
@@ -85,7 +84,6 @@ end
 
 group :development, :test do
   gem "rspec-rails"
-  gem "factory_bot_rails"
   gem "faker"
   gem "capybara"
   gem "selenium-webdriver"
@@ -101,4 +99,5 @@ end
 
 group :test do
   gem "database_cleaner"
+  gem "factory_bot_rails"
 end

Gemfile.lock

@@ -9,112 +9,133 @@ GIT
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (5.2.7)
+    actioncable (6.0.6.1)
-      actionpack (= 5.2.7)
+      actionpack (= 6.0.6.1)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailer (5.2.7)
+    actionmailbox (6.0.6.1)
-      actionpack (= 5.2.7)
+      actionpack (= 6.0.6.1)
-      actionview (= 5.2.7)
+      activejob (= 6.0.6.1)
-      activejob (= 5.2.7)
+      activerecord (= 6.0.6.1)
+      activestorage (= 6.0.6.1)
+      activesupport (= 6.0.6.1)
+      mail (>= 2.7.1)
+    actionmailer (6.0.6.1)
+      actionpack (= 6.0.6.1)
+      actionview (= 6.0.6.1)
+      activejob (= 6.0.6.1)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.2.7)
+    actionpack (6.0.6.1)
-      actionview (= 5.2.7)
+      actionview (= 6.0.6.1)
-      activesupport (= 5.2.7)
+      activesupport (= 6.0.6.1)
       rack (~> 2.0, >= 2.0.8)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+      rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actionview (5.2.7)
+    actiontext (6.0.6.1)
-      activesupport (= 5.2.7)
+      actionpack (= 6.0.6.1)
+      activerecord (= 6.0.6.1)
+      activestorage (= 6.0.6.1)
+      activesupport (= 6.0.6.1)
+      nokogiri (>= 1.8.5)
+    actionview (6.0.6.1)
+      activesupport (= 6.0.6.1)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.3)
+      rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (5.2.7)
+    activejob (6.0.6.1)
-      activesupport (= 5.2.7)
+      activesupport (= 6.0.6.1)
       globalid (>= 0.3.6)
-    activemodel (5.2.7)
+    activemodel (6.0.6.1)
-      activesupport (= 5.2.7)
+      activesupport (= 6.0.6.1)
     activemodel-serializers-xml (1.0.2)
       activemodel (> 5.x)
       activesupport (> 5.x)
       builder (~> 3.1)
-    activerecord (5.2.7)
+    activerecord (6.0.6.1)
-      activemodel (= 5.2.7)
+      activemodel (= 6.0.6.1)
-      activesupport (= 5.2.7)
+      activesupport (= 6.0.6.1)
-      arel (>= 9.0)
+    activestorage (6.0.6.1)
-    activestorage (5.2.7)
+      actionpack (= 6.0.6.1)
-      actionpack (= 5.2.7)
+      activejob (= 6.0.6.1)
-      activerecord (= 5.2.7)
+      activerecord (= 6.0.6.1)
-      marcel (~> 1.0.0)
+      marcel (~> 1.0)
-    activesupport (5.2.7)
+    activesupport (6.0.6.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    addressable (2.8.0)
+      zeitwerk (~> 2.2, >= 2.2.2)
-      public_suffix (>= 2.0.2, < 5.0)
+    addressable (2.8.6)
-    airbrussh (1.3.4)
+      public_suffix (>= 2.0.2, < 6.0)
+    airbrussh (1.5.1)
       sshkit (>= 1.6.1, != 1.7.0)
-    arel (9.0.0)
     ast (2.4.2)
-    autoprefixer-rails (9.6.1.1)
+    autoprefixer-rails (10.4.16.0)
-      execjs
+      execjs (~> 2)
-    awesome_print (1.8.0)
+    awesome_print (1.9.2)
-    bcrypt (3.1.13)
+    bcrypt (3.1.20)
-    better_errors (2.9.1)
+    better_errors (2.10.1)
-      coderay (>= 1.0.0)
       erubi (>= 1.0.0)
       rack (>= 0.9.0)
-    binding_of_caller (0.8.0)
+      rouge (>= 1.0.0)
+    better_html (1.0.16)
+      actionview (>= 4.0)
+      activesupport (>= 4.0)
+      ast (~> 2.0)
+      erubi (~> 1.4)
+      html_tokenizer (~> 0.0.6)
+      parser (>= 2.4)
+      smart_properties
+    binding_of_caller (1.0.0)
       debug_inspector (>= 0.0.1)
-    bootsnap (1.4.5)
+    bootsnap (1.18.3)
-      msgpack (~> 1.0)
+      msgpack (~> 1.2)
     bootstrap-sass (3.4.1)
       autoprefixer-rails (>= 5.2.1)
       sassc (>= 2.0.0)
-    bootstrap-sass-extras (0.0.7)
+    bootstrap-sass-extras (0.1.0)
       rails (>= 3.1.0)
     bootswatch-rails (3.3.5)
       railties (>= 3.1)
     builder (3.2.4)
-    byebug (11.0.1)
+    byebug (11.1.3)
-    capistrano (3.11.2)
+    capistrano (3.18.0)
       airbrussh (>= 1.0.0)
       i18n
       rake (>= 10.0.0)
       sshkit (>= 1.9.0)
-    capistrano-bundler (1.6.0)
+    capistrano-bundler (2.1.0)
       capistrano (~> 3.1)
-    capistrano-rails (1.4.0)
+    capistrano-rails (1.6.3)
       capistrano (~> 3.1)
-      capistrano-bundler (~> 1.1)
+      capistrano-bundler (>= 1.1, < 3)
     capistrano-rvm (0.1.2)
       capistrano (~> 3.0)
       sshkit (~> 1.2)
-    capistrano3-puma (4.0.0)
+    capistrano3-puma (5.2.0)
       capistrano (~> 3.7)
       capistrano-bundler
-      puma (~> 4.0)
+      puma (>= 4.0, < 6.0)
-    capybara (3.29.0)
+    capybara (3.36.0)
       addressable
+      matrix
       mini_mime (>= 0.1.3)
       nokogiri (~> 1.8)
       rack (>= 1.6.0)
       rack-test (>= 0.6.3)
-      regexp_parser (~> 1.5)
+      regexp_parser (>= 1.5, < 3.0)
       xpath (~> 3.2)
-    carrierwave (2.2.2)
+    carrierwave (3.0.5)
-      activemodel (>= 5.0.0)
+      activemodel (>= 6.0.0)
-      activesupport (>= 5.0.0)
+      activesupport (>= 6.0.0)
       addressable (~> 2.6)
       image_processing (~> 1.1)
       marcel (~> 1.0.0)
-      mini_mime (>= 0.1.3)
       ssrf_filter (~> 1.0)
-    childprocess (3.0.0)
+    childprocess (4.1.0)
     choice (0.2.0)
     chronic (0.10.2)
     chunky_png (1.4.0)
@@ -126,58 +147,65 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.12.2)
-    concurrent-ruby (1.1.10)
+    concurrent-ruby (1.2.3)
     copy_carrierwave_file (1.3.0)
       carrierwave (>= 0.9)
     crass (1.0.6)
-    database_cleaner (1.7.0)
+    database_cleaner (2.0.2)
-    debug_inspector (0.0.3)
+      database_cleaner-active_record (>= 2, < 3)
+    database_cleaner-active_record (2.1.0)
+      activerecord (>= 5.a)
+      database_cleaner-core (~> 2.0.0)
+    database_cleaner-core (2.0.1)
+    date (3.3.4)
+    debug_inspector (1.2.0)
     delorean (2.1.0)
       chronic
-    devise (4.7.1)
+    devise (4.9.3)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 4.1.0)
       responders
       warden (~> 1.2.3)
-    devise-i18n (1.8.2)
+    devise-i18n (1.12.0)
-      devise (>= 4.6)
+      devise (>= 4.9.0)
-    diff-lcs (1.3)
+    diff-lcs (1.5.1)
-    docile (1.3.2)
+    docile (1.4.0)
-    draper (3.1.0)
+    draper (4.0.2)
       actionpack (>= 5.0)
       activemodel (>= 5.0)
       activemodel-serializers-xml (>= 1.0)
       activesupport (>= 5.0)
       request_store (>= 1.0)
-    erubi (1.10.0)
+      ruby2_keywords
-    execjs (2.7.0)
+    erubi (1.12.0)
-    factory_bot (5.1.1)
+    execjs (2.9.1)
-      activesupport (>= 4.2.0)
+    factory_bot (6.4.5)
-    factory_bot_rails (5.1.1)
+      activesupport (>= 5.0.0)
-      factory_bot (~> 5.1.0)
+    factory_bot_rails (6.4.3)
-      railties (>= 4.2.0)
+      factory_bot (~> 6.4)
-    faker (2.5.0)
+      railties (>= 5.0.0)
-      i18n (~> 1.6.0)
+    faker (2.22.0)
-    faraday (0.16.2)
+      i18n (>= 1.8.11, < 2)
-      multipart-post (>= 1.2, < 3)
+    faraday (2.0.0)
-    ffi (1.15.5)
+      ruby2_keywords (>= 0.0.4)
+    ffi (1.16.3)
     font-awesome-sass (4.6.2)
       sass (>= 3.2)
-    formatador (0.2.5)
+    formatador (1.1.0)
-    globalid (1.0.0)
+    globalid (1.1.0)
       activesupport (>= 5.0)
-    globalize (5.3.0)
+    globalize (6.3.0)
-      activemodel (>= 4.2, < 6.1)
+      activemodel (>= 4.2, < 7.2)
-      activerecord (>= 4.2, < 6.1)
+      activerecord (>= 4.2, < 7.2)
       request_store (~> 1.0)
-    guard (2.15.1)
+    guard (2.18.1)
       formatador (>= 0.2.4)
       listen (>= 2.7, < 4.0)
       lumberjack (>= 1.0.12, < 2.0)
       nenv (~> 0.1)
       notiffany (~> 0.0)
-      pry (>= 0.9.12)
+      pry (>= 0.13.0)
       shellany (~> 0.0)
       thor (>= 0.18.1)
     guard-compat (1.2.1)
@@ -185,185 +213,216 @@ GEM
       guard (~> 2.1)
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
-    highline (2.0.3)
+    highline (2.1.0)
-    i18n (1.6.0)
+    html_tokenizer (0.0.7)
+    i18n (1.14.1)
       concurrent-ruby (~> 1.0)
-    i18n-tasks (0.9.37)
+    i18n-tasks (1.0.13)
       activesupport (>= 4.0.2)
       ast (>= 2.1.0)
+      better_html (>= 1.0, < 3.0)
       erubi
       highline (>= 2.0.0)
       i18n
-      parser (>= 2.2.3.0)
+      parser (>= 3.2.2.1)
       rails-i18n
       rainbow (>= 2.2.2, < 4.0)
       terminal-table (>= 1.5.1)
-    icalendar (2.5.3)
+    icalendar (2.10.1)
       ice_cube (~> 0.16)
-    ice_cube (0.16.3)
+    ice_cube (0.16.4)
     image_processing (1.12.2)
       mini_magick (>= 4.9.5, < 5)
       ruby-vips (>= 2.0.17, < 3)
-    jaro_winkler (1.5.3)
+    jbuilder (2.11.5)
-    jbuilder (2.9.1)
+      actionview (>= 5.0.0)
-      activesupport (>= 4.2.0)
+      activesupport (>= 5.0.0)
     jquery-datatables-rails (3.4.0)
       actionpack (>= 3.1)
       jquery-rails
       railties (>= 3.1)
       sass-rails
-    jquery-rails (4.3.5)
+    jquery-rails (4.6.0)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
-    json (2.2.0)
+    json (2.7.1)
-    libv8 (7.3.492.27.1)
+    language_server-protocol (3.17.0.3)
-    listen (3.7.1)
+    lint_roller (1.1.0)
+    listen (3.8.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    loofah (2.15.0)
+    loofah (2.22.0)
       crass (~> 1.0.2)
-      nokogiri (>= 1.5.9)
+      nokogiri (>= 1.12.0)
-    lumberjack (1.0.13)
+    lumberjack (1.2.10)
-    mail (2.7.1)
+    mail (2.8.1)
       mini_mime (>= 0.1.1)
+      net-imap
+      net-pop
+      net-smtp
     marcel (1.0.2)
-    method_source (0.9.2)
+    matrix (0.4.2)
-    mime-types (3.3)
+    method_source (1.0.0)
+    mime-types (3.5.2)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2019.0904)
+    mime-types-data (3.2024.0206)
-    mini_magick (4.11.0)
+    mini_magick (4.12.0)
-    mini_mime (1.1.2)
+    mini_mime (1.1.5)
-    mini_portile2 (2.8.0)
+    mini_portile2 (2.8.5)
-    mini_racer (0.2.6)
+    minitest (5.22.2)
-      libv8 (>= 6.9.411)
+    morrisjs-rails (0.5.1.3)
-    minitest (5.15.0)
+      railties (> 3.1, < 7)
-    morrisjs-rails (0.5.1.2)
+    msgpack (1.7.2)
-      railties (> 3.1, < 6)
+    mustermann (3.0.0)
-    msgpack (1.3.1)
+      ruby2_keywords (~> 0.0.1)
-    multipart-post (2.1.1)
+    mutex_m (0.2.0)
-    mustermann (1.0.3)
     nenv (0.3.0)
     nested_form (0.3.2)
-    net-scp (2.0.0)
+    net-imap (0.3.7)
-      net-ssh (>= 2.6.5, < 6.0.0)
+      date
-    net-ssh (5.2.0)
+      net-protocol
-    nio4r (2.5.8)
+    net-pop (0.1.2)
-    nokogiri (1.13.3)
+      net-protocol
+    net-protocol (0.2.2)
+      timeout
+    net-scp (4.0.0)
+      net-ssh (>= 2.6.5, < 8.0.0)
+    net-sftp (4.0.0)
+      net-ssh (>= 5.0.0, < 8.0.0)
+    net-smtp (0.4.0.1)
+      net-protocol
+    net-ssh (7.2.1)
+    nio4r (2.7.0)
+    nokogiri (1.13.10)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
     notiffany (0.1.3)
       nenv (~> 0.1)
       shellany (~> 0.0)
     orm_adapter (0.5.0)
-    parallel (1.17.0)
+    parallel (1.24.0)
-    parser (3.1.1.0)
+    parser (3.3.0.5)
       ast (~> 2.4.1)
-    pg (1.1.4)
+      racc
+    pg (1.5.5)
     phony (2.15.49)
     phony_rails (0.14.13)
       activesupport (>= 3.0)
       phony (> 2.15)
-    pry (0.12.2)
+    pry (0.14.2)
-      coderay (~> 1.1.0)
+      coderay (~> 1.1)
-      method_source (~> 0.9.0)
+      method_source (~> 1.0)
     pry-rails (0.3.9)
       pry (>= 0.10.4)
-    public_suffix (4.0.6)
+    public_suffix (5.0.4)
-    puma (4.3.11)
+    puma (5.6.8)
       nio4r (~> 2.0)
-    racc (1.6.0)
+    racc (1.7.3)
-    rack (2.2.3)
+    rack (2.2.8)
-    rack-protection (2.0.7)
+    rack-protection (3.0.0)
       rack
-    rack-test (1.1.0)
+    rack-test (2.1.0)
-      rack (>= 1.0, < 3)
+      rack (>= 1.3)
-    rails (5.2.7)
+    rails (6.0.6.1)
-      actioncable (= 5.2.7)
+      actioncable (= 6.0.6.1)
-      actionmailer (= 5.2.7)
+      actionmailbox (= 6.0.6.1)
-      actionpack (= 5.2.7)
+      actionmailer (= 6.0.6.1)
-      actionview (= 5.2.7)
+      actionpack (= 6.0.6.1)
-      activejob (= 5.2.7)
+      actiontext (= 6.0.6.1)
-      activemodel (= 5.2.7)
+      actionview (= 6.0.6.1)
-      activerecord (= 5.2.7)
+      activejob (= 6.0.6.1)
-      activestorage (= 5.2.7)
+      activemodel (= 6.0.6.1)
-      activesupport (= 5.2.7)
+      activerecord (= 6.0.6.1)
+      activestorage (= 6.0.6.1)
+      activesupport (= 6.0.6.1)
       bundler (>= 1.3.0)
-      railties (= 5.2.7)
+      railties (= 6.0.6.1)
       sprockets-rails (>= 2.0.0)
-    rails-dom-testing (2.0.3)
+    rails-dom-testing (2.2.0)
-      activesupport (>= 4.2.0)
+      activesupport (>= 5.0.0)
+      minitest
       nokogiri (>= 1.6)
-    rails-erd (1.6.0)
+    rails-erd (1.7.2)
       activerecord (>= 4.2)
       activesupport (>= 4.2)
       choice (~> 0.2.0)
       ruby-graphviz (~> 1.2)
-    rails-html-sanitizer (1.4.2)
+    rails-html-sanitizer (1.5.0)
-      loofah (~> 2.3)
+      loofah (~> 2.19, >= 2.19.1)
-    rails-i18n (5.1.3)
+    rails-i18n (7.0.8)
       i18n (>= 0.7, < 2)
-      railties (>= 5.0, < 6)
+      railties (>= 6.0.0, < 8)
-    railties (5.2.7)
+    railties (6.0.6.1)
-      actionpack (= 5.2.7)
+      actionpack (= 6.0.6.1)
-      activesupport (= 5.2.7)
+      activesupport (= 6.0.6.1)
       method_source
       rake (>= 0.8.7)
-      thor (>= 0.19.0, < 2.0)
+      thor (>= 0.20.3, < 2.0)
     rainbow (3.1.1)
-    rake (13.0.6)
+    rake (13.1.0)
     raphael-rails (2.1.2)
-    rb-fsevent (0.11.1)
+    rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     refile-mini_magick (0.2.0)
       mini_magick (~> 4.0)
       refile (~> 0.5)
-    regexp_parser (1.6.0)
+    regexp_parser (2.9.0)
-    request_store (1.4.1)
+    request_store (1.6.0)
       rack (>= 1.4)
-    responders (3.0.0)
+    responders (3.1.1)
-      actionpack (>= 5.0)
+      actionpack (>= 5.2)
-      railties (>= 5.0)
+      railties (>= 5.2)
-    rqrcode (2.1.1)
+    rexml (3.2.6)
+    rouge (3.30.0)
+    rqrcode (2.2.0)
       chunky_png (~> 1.0)
       rqrcode_core (~> 1.0)
     rqrcode_core (1.2.0)
-    rspec (3.8.0)
+    rspec (3.13.0)
-      rspec-core (~> 3.8.0)
+      rspec-core (~> 3.13.0)
-      rspec-expectations (~> 3.8.0)
+      rspec-expectations (~> 3.13.0)
-      rspec-mocks (~> 3.8.0)
+      rspec-mocks (~> 3.13.0)
-    rspec-core (3.8.2)
+    rspec-core (3.13.0)
-      rspec-support (~> 3.8.0)
+      rspec-support (~> 3.13.0)
-    rspec-expectations (3.8.5)
+    rspec-expectations (3.13.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
+      rspec-support (~> 3.13.0)
-    rspec-mocks (3.8.2)
+    rspec-mocks (3.13.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
+      rspec-support (~> 3.13.0)
-    rspec-rails (3.8.2)
+    rspec-rails (5.1.2)
-      actionpack (>= 3.0)
+      actionpack (>= 5.2)
-      activesupport (>= 3.0)
+      activesupport (>= 5.2)
-      railties (>= 3.0)
+      railties (>= 5.2)
-      rspec-core (~> 3.8.0)
+      rspec-core (~> 3.10)
-      rspec-expectations (~> 3.8.0)
+      rspec-expectations (~> 3.10)
-      rspec-mocks (~> 3.8.0)
+      rspec-mocks (~> 3.10)
-      rspec-support (~> 3.8.0)
+      rspec-support (~> 3.10)
-    rspec-support (3.8.3)
+    rspec-support (3.13.0)
-    rubocop (0.72.0)
+    rubocop (1.50.2)
-      jaro_winkler (~> 1.5.1)
+      json (~> 2.3)
       parallel (~> 1.10)
-      parser (>= 2.6)
+      parser (>= 3.2.0.0)
       rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.28.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 1.7)
+      unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-performance (1.4.1)
+    rubocop-ast (1.30.0)
-      rubocop (>= 0.71.0)
+      parser (>= 3.2.1.0)
-    ruby-graphviz (1.2.4)
+    rubocop-performance (1.16.0)
-    ruby-progressbar (1.10.1)
+      rubocop (>= 1.7.0, < 2.0)
-    ruby-vips (2.1.4)
+      rubocop-ast (>= 0.4.0)
+    ruby-graphviz (1.2.5)
+      rexml
+    ruby-progressbar (1.13.0)
+    ruby-vips (2.2.0)
       ffi (~> 1.12)
-    rubyzip (2.0.0)
+    ruby2_keywords (0.0.5)
+    rubyzip (2.3.2)
     sass (3.7.4)
       sass-listen (~> 4.0.0)
     sass-listen (4.0.0)
@@ -371,7 +430,7 @@ GEM
       rb-inotify (~> 0.9, >= 0.9.7)
     sass-rails (6.0.0)
       sassc-rails (~> 2.1, >= 2.1.1)
-    sassc (2.2.1)
+    sassc (2.4.0)
       ffi (~> 1.9)
     sassc-rails (2.1.2)
       railties (>= 4.0.0)
@@ -379,32 +438,35 @@ GEM
       sprockets (> 3.0)
       sprockets-rails
       tilt
-    search_object (1.2.2)
+    search_object (1.2.5)
-    selenium-webdriver (3.142.6)
+    selenium-webdriver (4.1.0)
-      childprocess (>= 0.5, < 4.0)
+      childprocess (>= 0.5, < 5.0)
+      rexml (~> 3.2, >= 3.2.5)
       rubyzip (>= 1.2.2)
     shellany (0.0.1)
-    simple_form (5.0.0)
+    simple_form (5.3.0)
-      actionpack (>= 5.0)
+      actionpack (>= 5.2)
-      activemodel (>= 5.0)
+      activemodel (>= 5.2)
-    simplecov (0.17.1)
+    simplecov (0.22.0)
       docile (~> 1.1)
-      json (>= 1.8, < 3)
+      simplecov-html (~> 0.11)
-      simplecov-html (~> 0.10.0)
+      simplecov_json_formatter (~> 0.1)
-    simplecov-html (0.10.2)
+    simplecov-html (0.12.3)
-    sinatra (2.0.7)
+    simplecov_json_formatter (0.1.4)
-      mustermann (~> 1.0)
+    sinatra (3.0.0)
-      rack (~> 2.0)
+      mustermann (~> 3.0)
-      rack-protection (= 2.0.7)
+      rack (~> 2.2, >= 2.2.4)
+      rack-protection (= 3.0.0)
       tilt (~> 2.0)
-    slim (4.0.1)
+    slim (5.2.1)
-      temple (>= 0.7.6, < 0.9)
+      temple (~> 0.10.0)
-      tilt (>= 2.0.6, < 2.1)
+      tilt (>= 2.1.0)
-    slim-rails (3.2.0)
+    slim-rails (3.6.3)
       actionpack (>= 3.1)
       railties (>= 3.1)
-      slim (>= 3.0, < 5.0)
+      slim (>= 3.0, < 6.0, != 5.0.0)
-    spring (2.1.0)
+    smart_properties (1.17.0)
+    spring (3.1.1)
     spring-commands-rspec (1.0.4)
       spring (>= 0.9.1)
     sprockets (3.7.2)
@@ -414,28 +476,41 @@ GEM
       actionpack (>= 5.2)
       activesupport (>= 5.2)
       sprockets (>= 3.0.0)
-    sqlite3 (1.4.1)
+    sqlite3 (1.6.9)
-    sshkit (1.20.0)
+      mini_portile2 (~> 2.8.0)
+    sshkit (1.22.0)
+      mutex_m
       net-scp (>= 1.1.2)
+      net-sftp (>= 2.1.2)
       net-ssh (>= 2.8.0)
-    ssrf_filter (1.0.7)
+    ssrf_filter (1.1.2)
-    standard (0.1.4)
+    standard (1.28.5)
-      rubocop (~> 0.72.0)
+      language_server-protocol (~> 3.17.0.2)
-      rubocop-performance (~> 1.4.0)
+      lint_roller (~> 1.0)
-    temple (0.8.2)
+      rubocop (~> 1.50.2)
+      standard-custom (~> 1.0.0)
+      standard-performance (~> 1.0.1)
+    standard-custom (1.0.2)
+      lint_roller (~> 1.0)
+      rubocop (~> 1.50)
+    standard-performance (1.0.1)
+      lint_roller (~> 1.0)
+      rubocop-performance (~> 1.16.0)
+    temple (0.10.3)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
-    thor (1.2.1)
+    thor (1.3.0)
     thread_safe (0.3.6)
-    tilt (2.0.10)
+    tilt (2.3.0)
-    tzinfo (1.2.9)
+    timeout (0.4.1)
+    tzinfo (1.2.11)
       thread_safe (~> 0.1)
     uglifier (4.2.0)
       execjs (>= 0.3.0, < 3)
-    unicode-display_width (1.6.1)
+    unicode-display_width (2.5.0)
-    warden (1.2.8)
+    warden (1.2.9)
-      rack (>= 2.0.6)
+      rack (>= 2.0.9)
-    websocket-driver (0.7.5)
+    websocket-driver (0.7.6)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
     xpath (3.2.0)
@@ -443,6 +518,7 @@ GEM
     yaml_db (0.7.0)
       rails (>= 3.0)
       rake (>= 0.8.7)
+    zeitwerk (2.6.13)
 
 PLATFORMS
   ruby
@@ -483,7 +559,6 @@ DEPENDENCIES
   jquery-datatables-rails
   jquery-rails
   mini_magick
-  mini_racer
   morrisjs-rails
   nested_form
   pg
@@ -491,7 +566,7 @@ DEPENDENCIES
   phony_rails
   pry-rails
   puma
-  rails (~> 5.2.7)
+  rails (~> 6.0.0)
   rails-erd
   rails-i18n
   raphael-rails
@@ -514,4 +589,4 @@ DEPENDENCIES
   yaml_db
 
 BUNDLED WITH
-   1.17.3
+   2.4.12

bin/rails

@@ -1,9 +1,4 @@
 #!/usr/bin/env ruby
-begin
-  load File.expand_path('../spring', __FILE__)
-rescue LoadError => e
-  raise unless e.message.include?('spring')
-end
 APP_PATH = File.expand_path('../config/application', __dir__)
 require_relative '../config/boot'
 require 'rails/commands'

bin/rake

@@ -1,9 +1,4 @@
 #!/usr/bin/env ruby
-begin
-  load File.expand_path('../spring', __FILE__)
-rescue LoadError => e
-  raise unless e.message.include?('spring')
-end
 require_relative '../config/boot'
 require 'rake'
 Rake.application.run

bin/setup

@@ -1,6 +1,5 @@
 #!/usr/bin/env ruby
 require 'fileutils'
-include FileUtils
 
 # path to your application root.
 APP_ROOT = File.expand_path('..', __dir__)
@@ -9,24 +8,25 @@ def system!(*args)
   system(*args) || abort("\n== Command #{args} failed ==")
 end
 
-chdir APP_ROOT do
+FileUtils.chdir APP_ROOT do
-  # This script is a starting point to setup your application.
+  # This script is a way to setup or update your development environment automatically.
+  # This script is idempotent, so that you can run it at anytime and get an expectable outcome.
   # Add necessary setup steps to this file.
 
   puts '== Installing dependencies =='
   system! 'gem install bundler --conservative'
   system('bundle check') || system!('bundle install')
 
-  # Install JavaScript dependencies if using Yarn
+  # Install JavaScript dependencies
   # system('bin/yarn')
 
   # puts "\n== Copying sample files =="
   # unless File.exist?('config/database.yml')
-  #   cp 'config/database.yml.sample', 'config/database.yml'
+  #   FileUtils.cp 'config/database.yml.sample', 'config/database.yml'
   # end
 
   puts "\n== Preparing database =="
-  system! 'bin/rails db:setup'
+  system! 'bin/rails db:prepare'
 
   puts "\n== Removing old logs and tempfiles =="
   system! 'bin/rails log:clear tmp:clear'

config/cable.yml

@@ -2,7 +2,7 @@ development:
   adapter: async
 
 test:
-  adapter: async
+  adapter: test
 
 production:
   adapter: redis

config/environments/development.rb

@@ -16,6 +16,7 @@ Rails.application.configure do
   # Run rails dev:cache to toggle caching.
   if Rails.root.join("tmp", "caching-dev.txt").exist?
     config.action_controller.perform_caching = true
+    config.action_controller.enable_fragment_cache_logging = true
 
     config.cache_store = :memory_store
     config.public_file_server.headers = {
@@ -27,7 +28,7 @@ Rails.application.configure do
     config.cache_store = :null_store
   end
 
-  # Store uploaded files on the local file system (see config/storage.yml for options)
+  # Store uploaded files on the local file system (see config/storage.yml for options).
   config.active_storage.service = :local
 
   # Don't care if the mailer can't send.
@@ -55,7 +56,7 @@ Rails.application.configure do
   # Suppress logger output for asset requests.
   config.assets.quiet = true
 
-  # Raises error for missing translations
+  # Raises error for missing translations.
   # config.action_view.raise_on_missing_translations = true
 
   # Use an evented file watcher to asynchronously detect changes in source code,

config/environments/production.rb

@@ -22,15 +22,12 @@ Rails.application.configure do
   # Apache or NGINX already handles this.
   config.public_file_server.enabled = ENV["RAILS_SERVE_STATIC_FILES"].present?
 
-  # Compress JavaScripts and CSS.
+  # Compress CSS using a preprocessor.
-  config.assets.js_compressor = :uglifier
   # config.assets.css_compressor = :sass
 
   # Do not fallback to assets pipeline if a precompiled asset is missed.
   config.assets.compile = false
 
-  # `config.assets.precompile` and `config.assets.version` have moved to config/initializers/assets.rb
-
   # Enable serving of images, stylesheets, and JavaScripts from an asset server.
   # config.action_controller.asset_host = 'http://assets.example.com'
 
@@ -38,10 +35,10 @@ Rails.application.configure do
   # config.action_dispatch.x_sendfile_header = 'X-Sendfile' # for Apache
   # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for NGINX
 
-  # Store uploaded files on the local file system (see config/storage.yml for options)
+  # Store uploaded files on the local file system (see config/storage.yml for options).
   config.active_storage.service = :local
 
-  # Mount Action Cable outside main process or domain
+  # Mount Action Cable outside main process or domain.
   # config.action_cable.mount_path = nil
   # config.action_cable.url = 'wss://example.com/cable'
   # config.action_cable.allowed_request_origins = [ 'http://example.com', /http:\/\/example.*/ ]
@@ -68,9 +65,9 @@ Rails.application.configure do
   # Use a different cache store in production.
   # config.cache_store = :mem_cache_store
 
-  # Use a real queuing backend for Active Job (and separate queues per environment)
+  # Use a real queuing backend for Active Job (and separate queues per environment).
   # config.active_job.queue_adapter     = :resque
-  # config.active_job.queue_name_prefix = "clarion_#{Rails.env}"
+  # config.active_job.queue_name_prefix = "clarion_production"
 
   config.action_mailer.perform_caching = false
 
@@ -104,4 +101,25 @@ Rails.application.configure do
 
   # Do not dump schema after migrations.
   config.active_record.dump_schema_after_migration = false
+
+  # Inserts middleware to perform automatic connection switching.
+  # The `database_selector` hash is used to pass options to the DatabaseSelector
+  # middleware. The `delay` is used to determine how long to wait after a write
+  # to send a subsequent read to the primary.
+  #
+  # The `database_resolver` class is used by the middleware to determine which
+  # database is appropriate to use based on the time delay.
+  #
+  # The `database_resolver_context` class is used by the middleware to set
+  # timestamps for the last write to the primary. The resolver uses the context
+  # class timestamps to determine how long to wait before reading from the
+  # replica.
+  #
+  # By default Rails will store a last write timestamp in the session. The
+  # DatabaseSelector middleware is designed as such you can define your own
+  # strategy for connection switching and pass that into the middleware through
+  # these configuration options.
+  # config.active_record.database_selector = { delay: 2.seconds }
+  # config.active_record.database_resolver = ActiveRecord::Middleware::DatabaseSelector::Resolver
+  # config.active_record.database_resolver_context = ActiveRecord::Middleware::DatabaseSelector::Resolver::Session
 end

config/environments/test.rb

@@ -1,11 +1,13 @@
+# The test environment is used exclusively to run your application's
+# test suite. You never need to work with it otherwise. Remember that
+# your test database is "scratch space" for the test suite and is wiped
+# and recreated between test runs. Don't rely on the data there!
+
 Rails.application.configure do
   # Settings specified here will take precedence over those in config/application.rb.
 
-  # The test environment is used exclusively to run your application's
+  config.cache_classes = false
-  # test suite. You never need to work with it otherwise. Remember that
+  config.action_view.cache_template_loading = true
-  # your test database is "scratch space" for the test suite and is wiped
-  # and recreated between test runs. Don't rely on the data there!
-  config.cache_classes = true
 
   # Do not eager load code on boot. This avoids loading your whole application
   # just for the purpose of running a single test. If you are using a tool that
@@ -21,6 +23,7 @@ Rails.application.configure do
   # Show full error reports and disable caching.
   config.consider_all_requests_local       = true
   config.action_controller.perform_caching = false
+  config.cache_store = :null_store
 
   # Raise exceptions instead of rendering exception templates.
   config.action_dispatch.show_exceptions = false
@@ -28,7 +31,7 @@ Rails.application.configure do
   # Disable request forgery protection in test environment.
   config.action_controller.allow_forgery_protection = false
 
-  # Store uploaded files on the local file system in a temporary directory
+  # Store uploaded files on the local file system in a temporary directory.
   config.active_storage.service = :test
 
   config.action_mailer.perform_caching = false
@@ -44,6 +47,6 @@ Rails.application.configure do
   # Print deprecation notices to the stderr.
   config.active_support.deprecation = :stderr
 
-  # Raises error for missing translations
+  # Raises error for missing translations.
   # config.action_view.raise_on_missing_translations = true
 end

config/initializers/content_security_policy.rb

@@ -11,6 +11,8 @@
 #   policy.object_src  :none
 #   policy.script_src  :self, :https
 #   policy.style_src   :self, :https
+#   # If you are using webpack-dev-server then specify webpack-dev-server host
+#   policy.connect_src :self, :https, "http://localhost:3035", "ws://localhost:3035" if Rails.env.development?
 
 #   # Specify URI for violation reports
 #   # policy.report_uri "/csp-violation-report-endpoint"
@@ -19,6 +21,9 @@
 # If you are using UJS then enable automatic nonce generation
 # Rails.application.config.content_security_policy_nonce_generator = -> request { SecureRandom.base64(16) }
 
+# Set the nonce only to specific directives
+# Rails.application.config.content_security_policy_nonce_directives = %w(script-src)
+
 # Report CSP violations to a specified URI
 # For further information see the following documentation:
 # https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy-Report-Only

config/initializers/new_framework_defaults_6_0.rb

@@ -0,0 +1,45 @@
+# Be sure to restart your server when you modify this file.
+#
+# This file contains migration options to ease your Rails 6.0 upgrade.
+#
+# Once upgraded flip defaults one by one to migrate to the new default.
+#
+# Read the Guide for Upgrading Ruby on Rails for more info on each option.
+
+# Don't force requests from old versions of IE to be UTF-8 encoded.
+# Rails.application.config.action_view.default_enforce_utf8 = false
+
+# Embed purpose and expiry metadata inside signed and encrypted
+# cookies for increased security.
+#
+# This option is not backwards compatible with earlier Rails versions.
+# It's best enabled when your entire app is migrated and stable on 6.0.
+# Rails.application.config.action_dispatch.use_cookies_with_metadata = true
+
+# Change the return value of `ActionDispatch::Response#content_type` to Content-Type header without modification.
+# Rails.application.config.action_dispatch.return_only_media_type_on_content_type = false
+
+# Return false instead of self when enqueuing is aborted from a callback.
+# Rails.application.config.active_job.return_false_on_aborted_enqueue = true
+
+# Send Active Storage analysis and purge jobs to dedicated queues.
+# Rails.application.config.active_storage.queues.analysis = :active_storage_analysis
+# Rails.application.config.active_storage.queues.purge    = :active_storage_purge
+
+# When assigning to a collection of attachments declared via `has_many_attached`, replace existing
+# attachments instead of appending. Use #attach to add new attachments without replacing existing ones.
+# Rails.application.config.active_storage.replace_on_assign_to_many = true
+
+# Use ActionMailer::MailDeliveryJob for sending parameterized and normal mail.
+#
+# The default delivery jobs (ActionMailer::Parameterized::DeliveryJob, ActionMailer::DeliveryJob),
+# will be removed in Rails 6.1. This setting is not backwards compatible with earlier Rails versions.
+# If you send mail in the background, job workers need to have a copy of
+# MailDeliveryJob to ensure all delivery jobs are processed properly.
+# Make sure your entire app is migrated and stable on 6.0 before using this setting.
+# Rails.application.config.action_mailer.delivery_job = "ActionMailer::MailDeliveryJob"
+
+# Enable the same cache key to be reused when the object being cached of type
+# `ActiveRecord::Relation` changes by moving the volatile information (max updated at and count)
+# of the relation's cache key into the cache version to support recycling cache key.
+# Rails.application.config.active_record.collection_cache_versioning = true

config/spring.rb

@@ -1,6 +1,6 @@
-%w[
+Spring.watch(
-  .ruby-version
+  ".ruby-version",
-  .rbenv-vars
+  ".rbenv-vars",
-  tmp/restart.txt
+  "tmp/restart.txt",
-  tmp/caching-dev.txt
+  "tmp/caching-dev.txt"
-].each { |path| Spring.watch(path) }
+)

db/migrate/20240219191236_add_foreign_key_constraint_to_active_storage_attachments_for_blob_id.active_storage.rb

@@ -0,0 +1,10 @@
+# This migration comes from active_storage (originally 20180723000244)
+class AddForeignKeyConstraintToActiveStorageAttachmentsForBlobId < ActiveRecord::Migration[6.0]
+  def up
+    return if foreign_key_exists?(:active_storage_attachments, column: :blob_id)
+
+    if table_exists?(:active_storage_blobs)
+      add_foreign_key :active_storage_attachments, :active_storage_blobs, column: :blob_id
+    end
+  end
+end