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 c6212d89f8 Merge commit '9e6c02fd815253712c2e8ba1c1ebed092a007653' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/application_controller.rb: Upstream added an `include` where we had an extra `include` due to glitch-soc's theming system. Added upstream's new `include`.		1 year ago
..
migrate	Merge commit '6ee7c03b282663700b2e3f2f83b57b163aac2a35' into glitch-soc/merge-upstream	1 year ago
post_migrate	Merge commit '6ee7c03b282663700b2e3f2f83b57b163aac2a35' into glitch-soc/merge-upstream	1 year ago
seeds	Enable Rubocop Style/FrozenStringLiteralComment (#23793)	1 year ago
views	Fix some old migration scripts (#17394)	3 years ago
schema.rb	Merge commit '9e6c02fd815253712c2e8ba1c1ebed092a007653' into glitch-soc/merge-upstream	1 year ago
seeds.rb	Drop EOL Ruby 2.7 (#24237)	2 years ago