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 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.		2 years ago
..
assets.rake	Fix most rubocop issues (#2165)	2 years ago
auto_annotate_models.rake	Autofix Rubocop remaining Layout rules (#23679)	2 years ago
branding.rake	Apply Rubocop Rails/RootPublicPath (#23447)	2 years ago
db.rake	Autofix Rubocop Style/RedundantBegin (#23703)	2 years ago
emojis.rake	Autofix Rubocop Style/RedundantArgument (#23798)	2 years ago
glitchsoc.rake	Fix most rubocop issues (#2165)	2 years ago
mastodon.rake	Autofix Rubocop Rails/RootPathnameMethods (#23760)	2 years ago
repo.rake	Enable Rubocop Performance/DeleteSuffix (#24077)	2 years ago
statistics.rake	Audofix Rubocop Style/WordArray (#23739)	2 years ago
tests.rake	Fix Rails/SquishedSQLHeredocs cop (#24694)	2 years ago