You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Claire c48ec9cb8c Merge commit 'b85c387c5c0527b0ad31c27031a09d361826c5fc' into glitch-soc/merge-upstream ... Conflicts: - `config/initializers/content_security_policy.rb`: Kept our version, it was not affected by upstream's bug.		1 year ago
..
migrate	Merge commit 'b85c387c5c0527b0ad31c27031a09d361826c5fc' into glitch-soc/merge-upstream	1 year ago
post_migrate	Merge commit '0ad2413b35287958f59073a5b63aecc659a64d98' into glitch-soc/merge-upstream	2 years ago
seeds	Fix situations in which instance actor can be set to a Mastodon-incompatible name (#22307)	2 years ago
views	Fix some old migration scripts (#17394)	3 years ago
schema.rb	Merge commit 'b85c387c5c0527b0ad31c27031a09d361826c5fc' into glitch-soc/merge-upstream	1 year ago
seeds.rb	Drop EOL Ruby 2.7 (#24237)	2 years ago