Claire 42a0898f16 Merge commit '3a2a15c6ea4d4603469861ed9be09da12a122e45' into glitch-soc/merge-upstream ...

Conflicts:
- `app/views/settings/preferences/appearance/show.html.haml`:
  Conflict because glitch-soc does not have a theme selector here.

2023-06-10 18:42:29 +02:00

..

migrate

Merge commit '3a2a15c6ea4d4603469861ed9be09da12a122e45' into glitch-soc/merge-upstream

2023-06-10 18:42:29 +02:00

post_migrate

Merge commit '0ad2413b35287958f59073a5b63aecc659a64d98' into glitch-soc/merge-upstream

2023-05-08 15:28:36 +02:00

seeds

Fix situations in which instance actor can be set to a Mastodon-incompatible name (#22307)

2023-01-18 16:33:03 +01:00

views

Fix some old migration scripts (#17394)

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

schema.rb

Merge commit '3a2a15c6ea4d4603469861ed9be09da12a122e45' into glitch-soc/merge-upstream

2023-06-10 18:42:29 +02:00

seeds.rb

Drop EOL Ruby 2.7 (#24237)

2023-04-27 01:46:18 +02:00