mastodon/spec
Claire 3d25fe0426 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `.github/workflows/build-image.yml`:
  Upstream changed the workflow a bit.
  Conflict comes from us pushing to ghcr while upstream pushes to dockerhub.
  Ported the upstream changes while still pushing to ghcr.
2022-02-23 18:13:12 +01:00
..
controllers Merge branch 'main' into glitch-soc/merge-upstream 2022-02-23 18:13:12 +01:00
fabricators Add appeals (#17364) 2022-02-14 21:27:53 +01:00
features
…
fixtures
…
helpers
…
lib Merge branch 'main' into glitch-soc/merge-upstream 2022-02-17 10:58:44 +01:00
mailers Add appeals (#17364) 2022-02-14 21:27:53 +01:00
models Merge branch 'main' into glitch-soc/merge-upstream 2022-02-23 18:13:12 +01:00
policies
…
presenters
…
requests
…
routing
…
serializers/activitypub
…
services Merge branch 'main' into glitch-soc/merge-upstream 2022-02-23 18:13:12 +01:00
support
…
validators Merge branch 'main' into glitch-soc/merge-upstream 2022-02-23 18:13:12 +01:00
views
…
workers
…
rails_helper.rb
…
spec_helper.rb
…