mastodon/lib/tasks
Claire 193250556c Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `README.md`:
  Upstream changed their README, we have our own.
  Kept ours.
- `app/helpers/application_helper.rb`:
  Minor code style fix upstream, on a line that is different in glitch-soc
  due to the different theming system.
  Applied the code style fix to our own code.
- `app/views/settings/preferences/appearance/show.html.haml`:
  Code style fix on a line next to lines exclusive to glitch-soc.
  Applied upstream changes.
- `yarn.lock`:
  Upstream updated a dependency textually close to a glitch-soc-only
  dependency.
  Updated the dependency like upstream did.
2023-03-16 23:12:59 +01:00
..
assets.rake Merge branch 'main' into glitch-soc/merge-upstream 2023-02-09 12:46:12 +01: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 Add Rake task to backfill local-only flag (#253) 2017-12-10 22:49:59 -06: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 pre-4.0 admin action logs (#22091) 2022-12-06 23:38:03 +01:00