treehouse
/
mastodon
22
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity
mastodon/spec
History
Claire aeacebb3d7 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `.github/workflows/build-image.yml`:
  Upstream updated `docker/build-push-action`, and we a different config
  for `docker/metadata-action` so the lines directly above were different,
  but it's not a real conflict.
  Upgraded `docker/build-push-action` as upstream did.
- `app/javascript/mastodon/features/compose/components/compose_form.js`:
  Upstream changed the codestyle near a line we had modified to accommodate
  configurable character count.
  Kept our change.
 		2023-02-03 19:23:27 +01:00
..
config/initializers Fix rate limiting for paths with formats (#20675) 2022-11-14 20:26:31 +01:00
controllers Merge branch 'main' into glitch-soc/merge-upstream 2023-02-03 19:23:27 +01:00
fabricators Add `roles` attribute to Account entities in REST API (#23255) 2023-01-25 19:55:40 +01:00
features Change public accounts pages to mount the web UI (#19319) 2022-10-20 14:35:29 +02:00
fixtures Change domain block CSV parsing to be more robust and handle more lists (#21470) 2023-01-18 16:20:52 +01:00
helpers Use Rails tag API to build RSS feed for spoilers and polls (#20163) 2022-12-15 16:39:41 +01:00
lib Merge branch 'main' into glitch-soc/merge-upstream 2023-01-12 10:15:46 +01:00
mailers Add support for language preferences for trending statuses and links (#18288) 2022-10-08 16:45:40 +02:00
models Merge branch 'main' into glitch-soc/merge-upstream 2023-01-24 20:32:31 +01:00
policies Merge branch 'main' into glitch-soc/merge-upstream 2022-10-28 19:23:58 +02:00
presenters Merge branch 'main' into glitch-soc/merge-upstream 2022-12-15 20:25:25 +01:00
requests Change public accounts pages to mount the web UI (#19319) 2022-10-20 14:35:29 +02:00
routing Change public accounts pages to mount the web UI (#19319) 2022-10-20 14:35:29 +02:00
serializers/activitypub
…
services Merge branch 'main' into glitch-soc/merge-upstream 2023-01-24 20:32:31 +01:00
support Validate nodeinfo response by schema (#21395) 2022-12-15 15:43:05 +01:00
validators Merge branch 'main' into glitch-soc/merge-upstream 2023-01-24 20:32:31 +01:00
views/statuses Fix style for hashes (#20518) 2022-11-17 11:05:39 +01:00
workers Fix followers count not being updated when migrating follows (#19998) 2022-11-07 15:38:55 +01:00
rails_helper.rb Fix single Redis connection being used across all threads (#18135) 2022-04-28 17:47:34 +02:00
spec_helper.rb Improve tests involving push_bulk (#17508) 2022-02-10 19:42:45 +01:00