You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
catstodon/db
Claire 7623e18124 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `README.md`:
  Upstream README has been changed, but we have a completely different one.
  Kept our `README.md`.
- `lib/sanitize_ext/sanitize_config.rb`:
  Upstream added support for more incoming HTML tags (a large subset of what
  glitch-soc accepts).
  Change the code style to match upstream's but otherwise do not change our
  code.
- `spec/lib/sanitize_config_spec.rb`:
  Upstream added support for more incoming HTML tags (a large subset of what
  glitch-soc accepts).
  Kept our version, since the tests are mostly glitch-soc's, except for cases
  which are purposefuly different.
1 year ago
..
migrate Merge branch 'main' into glitch-soc/merge-upstream 1 year ago
post_migrate Merge branch 'main' into glitch-soc/merge-upstream 1 year ago
seeds Fix situations in which instance actor can be set to a Mastodon-incompatible name (#22307) 1 year ago
views Fix some old migration scripts (#17394) 2 years ago
schema.rb Merge branch 'main' into glitch-soc/merge-upstream 1 year ago
seeds.rb Add customizable user roles (#18641) 2 years ago