mastodon/app/views
Claire 954e052b07 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/models/media_attachment.rb`:
  Upstream moved hardcoded values around, while in glitch-soc they are
  configurable.
  Moved them like upstream, but keeping glitch-soc's ability to configure
  them through env vars.
2022-02-22 18:06:29 +01:00
..
about
accounts Merge branch 'main' into glitch-soc/merge-upstream 2021-11-26 22:53:55 +01:00
admin Merge branch 'main' into glitch-soc/merge-upstream 2022-02-22 18:06:29 +01:00
admin_mailer Add appeals (#17364) 2022-02-14 21:27:53 +01:00
application
auth Merge branch 'main' into glitch-soc/merge-upstream 2022-02-17 10:58:44 +01:00
authorize_interactions
directories
disputes/strikes Fix link colors in report and strike details (#17616) 2022-02-22 15:27:25 +01:00
errors Add specific rate limits for posting and following (#13172) 2020-03-08 15:17:39 +01:00
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 2022-02-17 10:58:44 +01:00
media
notification_mailer
oauth
public_timelines
relationships Merge branch 'main' into glitch-soc/merge-upstream 2021-07-08 16:17:19 +02:00
remote_follow Admission-based registrations mode (#10250) 2019-03-14 05:28:30 +01:00
remote_interaction
settings Merge branch 'main' into glitch-soc/merge-upstream 2022-02-17 10:58:44 +01:00
shared
shares
statuses Merge branch 'main' into glitch-soc/merge-upstream 2022-02-17 10:58:44 +01:00
statuses_cleanup
tags
user_mailer Add appeals (#17364) 2022-02-14 21:27:53 +01:00
well_known/host_meta