mastodon/.github
Claire 6f342a6d4c Merge commit '34e826f373d20f6230d1ef0aa03ad41a3bdf5998' into glitch-soc/merge-upstream
Conflicts:
- `app/helpers/theme_helper.rb`:
  Conflict caused by our different theme systems.
  Ported upstream's changes.
- `app/models/account.rb`:
  Upstream basically made a change we already made.
  Moved constant declaration to match upstream.
2024-05-01 18:56:48 +02:00
..
ISSUE_TEMPLATE Improve the bug report templates (#25621) 2023-07-21 10:46:12 +02:00
actions Update `actions/cache` to v4 (updates node 16->20) (#29025) 2024-01-31 16:55:50 +00:00
workflows Merge commit '34e826f373d20f6230d1ef0aa03ad41a3bdf5998' into glitch-soc/merge-upstream 2024-05-01 18:56:48 +02:00
codecov.yml Disable codecov comments on PRs (#29464) 2024-02-29 23:25:04 +00:00
renovate.json5 Add Renovate grouped updates for RSpec and RuboCop (#29621) 2024-03-21 10:35:12 +00:00
stale.yml
stylelint-matcher.json