mastodon-glitch/.github
Claire 077e0c6812 Merge commit '0b4a3a04378ce43f2f314b9446b5053f6b374c6d' into glitch-soc/merge-upstream
Conflicts:
- `Gemfile.lock`:
  Conflict caused by the `json` gem thing once again.
  Updated as upstream did, but keeping the most recent `json` version.
- `spec/helpers/application_helper_spec.rb`:
  Upstream refactored a bunch of specs, including one place that differs
  because of glitch-soc's theming system.
  Refactored as upstream did, adapting it for glitch-soc's theming system.
2023-12-20 22:16:50 +01:00
..
ISSUE_TEMPLATE Improve the bug report templates (#25621) 2023-07-21 10:46:12 +02:00
actions Update actions/setup-node action to v4 (#27996) 2023-11-20 10:17:13 +00:00
workflows Merge commit '85662a5a57531af5402a6777d0b1089e78c56815' into glitch-soc/merge-upstream 2023-12-20 20:10:45 +01:00
codecov.yml Improve codecov config (#27860) 2023-11-15 09:20:24 +00:00
renovate.json5 Replace Sprockets with Propshaft (#28239) 2023-12-06 10:19:24 +00:00
stale.yml Change stale bot to only touch pull requests over 120 days old (#12217) 2019-10-26 12:45:52 +02:00
stylelint-matcher.json Set-up Problem Matchers (#18598) 2022-06-16 22:09:43 +02:00