Claire 9a3d91f629 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

..

migrate

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

2022-11-06 09:50:41 +01:00

post_migrate

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

2022-12-07 09:03:42 +01:00

seeds

Add customizable user roles (#18641)

2022-07-05 02:41:40 +02:00

views

Fix some old migration scripts (#17394)

2022-01-30 21:38:54 +01:00

schema.rb

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

2022-12-07 09:03:42 +01:00

seeds.rb

Add customizable user roles (#18641)

2022-07-05 02:41:40 +02:00