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
..
assets.rake	Fix most rubocop issues (#2165)	2023-04-09 11:25:30 +02:00
auto_annotate_models.rake	…
branding.rake	…
db.rake	…
emojis.rake	Autofix Rubocop Style/RedundantArgument (#23798)	2023-03-16 10:34:00 +09:00
glitchsoc.rake	Fix most rubocop issues (#2165)	2023-04-09 11:25:30 +02:00
mastodon.rake	…
repo.rake	…
statistics.rake	…
tests.rake	Fix Rails/SquishedSQLHeredocs cop (#24694)	2023-04-30 06:43:50 +02:00