This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.
mastodon/app
Claire 3e63fcd4f0 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/models/status.rb`:
  Minor upstream refactor moved hook definitions around,
  and glitch-soc has an extra `before_create`.
  Moved the `before_create` accordingly.
- `app/services/batched_remove_status_service.rb`:
  Minor upstream refactor changed a block in which glitch-soc
  had one extra call to handle direct timelines.
  Adapted changes to keep glitch-soc's extra call.
2023-01-12 10:15:46 +01:00
..
chewy
controllers Merge branch 'main' into glitch-soc/merge-upstream 2023-01-10 09:39:15 +01:00
helpers Merge branch 'main' into glitch-soc/merge-upstream 2022-12-15 20:25:25 +01:00
javascript Merge branch 'main' into glitch-soc/merge-upstream 2023-01-12 10:15:46 +01:00
lib Merge branch 'main' into glitch-soc/merge-upstream 2023-01-12 10:15:46 +01:00
mailers
models Merge branch 'main' into glitch-soc/merge-upstream 2023-01-12 10:15:46 +01:00
policies
presenters Add follow request banner on account header (#20785) 2022-12-15 18:50:11 +01:00
serializers Merge branch 'main' into glitch-soc/merge-upstream 2023-01-05 14:16:25 +01:00
services Merge branch 'main' into glitch-soc/merge-upstream 2023-01-12 10:15:46 +01:00
validators Merge branch 'main' into glitch-soc/merge-upstream 2023-01-05 14:16:25 +01:00
views Merge branch 'main' into glitch-soc/merge-upstream 2023-01-12 10:15:46 +01:00
workers Merge branch 'main' into glitch-soc/merge-upstream 2022-12-15 20:25:25 +01:00