mastodon/lib/tasks
Claire 2d029dedd9 Merge commit '0ad2413b35287958f59073a5b63aecc659a64d98' 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 Autofix Rubocop remaining Layout rules (#23679) 2023-02-20 06:58:28 +01:00
branding.rake Apply Rubocop Rails/RootPublicPath (#23447) 2023-02-08 10:38:07 +01:00
db.rake Autofix Rubocop Style/RedundantBegin (#23703) 2023-02-19 07:09:40 +09:00
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 Autofix Rubocop Rails/RootPathnameMethods (#23760) 2023-02-22 09:57:15 +09:00
repo.rake Enable Rubocop Performance/DeleteSuffix (#24077) 2023-03-13 00:03:07 +01:00
statistics.rake Audofix Rubocop Style/WordArray (#23739) 2023-02-20 06:14:10 +01:00
tests.rake Fix Rails/SquishedSQLHeredocs cop (#24694) 2023-04-30 06:43:50 +02:00