Claire 2aaf3528ca Merge commit 'd548faf69321260ab4c2a16759ca77773189126a' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/styles/mastodon/forms.scss`: Conflict because we ran eslint autofix on upstream files. - `config/initializers/content_security_policy.rb`: Code style changes but we have a different version. Kept our version. - `streaming/index.js`: Upstream fixed a typo close to glitch-soc-only code. Applied upstream's changes.		2023-05-08 15:28:36 +02:00
..
migrate	Merge commit 'd548faf69321260ab4c2a16759ca77773189126a' into glitch-soc/merge-upstream	2023-05-08 15:28:36 +02:00
post_migrate	Merge commit 'd548faf69321260ab4c2a16759ca77773189126a' 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	Migrate glitch-soc's exclusive user settings	2023-03-31 22:50:57 +02:00
seeds.rb	Drop EOL Ruby 2.7 (#24237)	2023-04-27 01:46:18 +02:00