Claire 9ae60f8738 Merge commit '82e477b184' into glitch-soc/merge-upstream ... Conflicts: - `db/migrate/20180831171112_create_bookmarks.rb`: Upstream ran a lint fix on this file, but this file is different in glitch-soc because the feature was added much earlier. Ran the lint fix on our own version of the file.		2023-07-12 16:03:05 +02:00
..
migrate	Merge commit '82e477b184' into glitch-soc/merge-upstream	2023-07-12 16:03:05 +02:00
post_migrate	Merge commit '82e477b184' into glitch-soc/merge-upstream	2023-07-12 16:03:05 +02:00
seeds	Enable Rubocop Style/FrozenStringLiteralComment (#23793)	2023-07-12 09:47:08 +02:00
views	Fix some old migration scripts (#17394)	2022-01-30 21:38:54 +01:00
schema.rb	Merge branch 'main' into glitch-soc/merge-upstream	2023-07-05 12:01:26 +02:00
seeds.rb	Drop EOL Ruby 2.7 (#24237)	2023-04-27 01:46:18 +02:00