Merge branch 'main' into njw-nama-download

.github/workflows/ci_rails.yml

@@ -36,11 +36,6 @@ jobs:
       - name: Start mySQL
         run: sudo systemctl start mysql.service
 
-      # https://github.com/trilogy-libraries/activerecord-trilogy-adapter/issues/64
-      # Issue in the trilogy gem where it cannot support `caching_sha2_password`
-      # https://github.com/trilogy-libraries/trilogy/issues/26
-      # For now need to ensure user is IDENTIFIED WITH `mysql_native_password`
-      # (change is in db/initialize.sql)
       - name: Create and configure db
         run: |
           mysql -u root -proot < db/initialize.sql

.ruby-version

@@ -1 +1 @@
-3.3.0
+3.3.6

Gemfile

@@ -9,7 +9,7 @@ gem("sorted_set")
 source("https://rubygems.org")
 
 # To bundle edge Rails instead: gem "rails", github: "rails/rails"
-# gem("rails", "~> 7.1.3")
+# gem("rails", "~> 7.2.2.1")
 
 # To skip loading parts of Rails, bundle the constituent gems separately.
 # NOTE: Remember to require the classes also, in config/application.rb
@@ -19,19 +19,19 @@ source("https://rubygems.org")
 # Convenience group for updating rails constituents with one command
 # Usage: bundle update --group==rails
 group :rails do
-  gem("actioncable", "~> 7.1.3")
-  # gem("actionmailbox", "~> 7.1.3")
-  gem("actionmailer", "~> 7.1.3")
-  gem("actionpack", "~> 7.1.3")
-  # gem("actiontext", "~> 7.1.3")
-  gem("actionview", "~> 7.1.3")
-  gem("activejob", "~> 7.1.3")
-  gem("activemodel", "~> 7.1.3")
-  gem("activerecord", "~> 7.1.3")
-  # gem("activestorage", "~> 7.1.3")
-  gem("activesupport", "~> 7.1.3")
+  gem("actioncable", "~> 7.2.2.1")
+  # gem("actionmailbox", "~> 7.2.2.1")
+  gem("actionmailer", "~> 7.2.2.1")
+  gem("actionpack", "~> 7.2.2.1")
+  # gem("actiontext", "~> 7.2.2.1")
+  gem("actionview", "~> 7.2.2.1")
+  gem("activejob", "~> 7.2.2.1")
+  gem("activemodel", "~> 7.2.2.1")
+  gem("activerecord", "~> 7.2.2.1")
+  # gem("activestorage", "~> 7.2.2.1")
+  gem("activesupport", "~> 7.2.2.1")
   gem("bundler")
-  gem("railties", "~> 7.1.3")
+  gem("railties", "~> 7.2.2.1")
 end
 
 # Use trilogy as db connector
@@ -116,8 +116,6 @@ gem("fastimage")
 # for detecting file type of uploaded images
 gem("mimemagic")
 
-# Get data from third-party websites
-gem("httparty")
 # Gems used for iNat import
 gem("oauth2")
 gem("rest-client")
@@ -154,6 +152,9 @@ gem("prawn-svg")
 gem("prawn")
 gem("prawn-manual_builder")
 
+# csv generation support
+gem("csv")
+
 # Use puma as the app server, also available for system tests
 # To use Webrick locally, run `bundle config set --local without 'production'`
 # https://stackoverflow.com/a/23125762/3357635