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 040b7d37a4 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/services/remove_status_service.rb`:
  Conflict due to glitch-soc having extra code for a proper direct visibility
  timeline, in a part of the code upstream refactored.
  Restored glitch-soc's extra code in the refactored bit.
2022-05-16 09:42:32 +02:00
..
chewy
controllers Merge branch 'main' into glitch-soc/merge-upstream 2022-05-16 09:42:32 +02:00
helpers Merge branch 'main' into glitch-soc/merge-upstream 2022-05-11 09:37:48 +02:00
javascript Merge branch 'main' into glitch-soc/merge-upstream 2022-05-16 09:42:32 +02:00
lib Merge branch 'main' into glitch-soc/merge-upstream 2022-05-16 09:42:32 +02:00
mailers
models Merge branch 'main' into glitch-soc/merge-upstream 2022-05-16 09:42:32 +02:00
policies
presenters
serializers Merge branch 'main' into glitch-soc/merge-upstream 2022-05-11 09:37:48 +02:00
services Merge branch 'main' into glitch-soc/merge-upstream 2022-05-16 09:42:32 +02:00
validators Allow import/export of instance-level domain blocks/allows (#1754) 2022-05-16 09:29:01 +02:00
views Merge branch 'main' into glitch-soc/merge-upstream 2022-05-16 09:42:32 +02:00
workers Merge branch 'main' into glitch-soc/merge-upstream 2022-05-16 09:42:32 +02:00