Merge branch 'main' into glitch-soc/merge-upstream

Conflicts: - `app/models/concerns/domain_materializable.rb`: Fixed a code style issue upstream in a PR that got merged in glitch-soc earlier. Changed the code to match upstream's.
2022-12-07 09:03:42 +01:00
parent fe523a3045 b59fb28e90
commit 9a3d91f629
22 changed files with 443 additions and 59 deletions
--- a/db/schema.rb
+++ b/db/schema.rb
@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.

-ActiveRecord::Schema.define(version: 2022_11_04_133904) do
+ActiveRecord::Schema.define(version: 2022_12_06_114142) do

  # These are extensions that must be enabled in order to support this database
  enable_extension "plpgsql"