mastodon/app/views
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
..
about
accounts
admin Merge branch 'main' into glitch-soc/merge-upstream 2023-01-12 10:15:46 +01:00
admin_mailer
application
auth
authorize_interactions
custom_css
disputes/strikes
errors
filters
follower_accounts
following_accounts
home
invites Remove invite comments from UI (#12068) 2019-10-03 22:37:13 +02:00
kaminari
layouts Merge branch 'main' into glitch-soc/merge-upstream 2023-01-05 14:16:25 +01:00
media
notification_mailer
oauth
privacy
relationships
settings
shared
shares
statuses
statuses_cleanup
tags
user_mailer
well_known/host_meta