Merge remote-tracking branch 'origin/dev' into dev

# Conflicts: # lib/auth.js
2022-10-25 10:46:32 -07:00 · 2022-10-25 10:46:32 -07:00 · 2ad5cd9335
parent ac070d3ce9 ebf439c598
commit 2ad5cd9335
2 changed files with 3 additions and 1 deletions
--- a/components/forms/EventDataForm.js
+++ b/components/forms/EventDataForm.js
@ -22,7 +22,7 @@ export const filterOptions = [
  { label: 'Count', value: 'count' },
  { label: 'Average', value: 'avg' },
  { label: 'Minimum', value: 'min' },
-  { label: 'Maxmimum', value: 'max' },
+  { label: 'Maximum', value: 'max' },
  { label: 'Sum', value: 'sum' },
 ];

--- a/db/postgresql/migrations/04_add_uuid/migration.sql
+++ b/db/postgresql/migrations/04_add_uuid/migration.sql
@ -1,3 +1,5 @@
+-- CreateExtension
+CREATE EXTENSION IF NOT EXISTS pgcrypto;

 -- AlterTable
 ALTER TABLE "account" ADD COLUMN "account_uuid" UUID NULL;