Merge branch 'main' into pattern-search-controllers

.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

.gitignore

@@ -39,14 +39,19 @@ coverage
 /config/master.key
 /config/newrelic.yml
 /config/credentials/production.key
+/config/credentials/test.key
+/config/credentials/mo-image-archive-service-account.json
 
 # This is created by a cronjob, not checked in.
 public/name_list_data.js
+
 # Local field slip jobs
 public/field_slips
 
+# Original image cache
+public/orig_cache
+
 # DB snapshots are often lying about, don't want them accidentally checked in.
 checkpoint*
 db/checkpoint*
 
-/config/credentials/test.key