mastodon/app/views
Claire 7782e4dc0d Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `app/controllers/about_controller.rb`:
  Minor conflict caused by glitch-soc's theming system.
  Ported upstream changes.
2020-12-10 09:41:49 +01:00
..
about Merge branch 'master' into glitch-soc/merge-upstream 2020-12-10 09:41:49 +01:00
accounts Merge branch 'master' into glitch-soc/merge-upstream 2020-11-07 18:23:02 +01:00
admin Merge branch 'master' into glitch-soc/merge-upstream 2020-11-07 18:23:02 +01:00
admin_mailer
application
auth Merge branch 'master' into glitch-soc/merge-upstream 2020-12-10 09:41:49 +01:00
authorize_interactions
directories
errors
filters
follower_accounts
following_accounts
home Merge branch 'master' into glitch-soc/merge-upstream 2020-11-07 18:23:02 +01:00
invites
kaminari
layouts Merge branch 'master' into glitch-soc/merge-upstream 2020-11-07 18:23:02 +01:00
media Merge branch 'master' into glitch-soc/merge-upstream 2020-11-07 18:23:02 +01:00
notification_mailer
oauth Refactor settings controllers (#14767) 2020-09-11 20:56:35 +02:00
public_timelines Add subresource integrity for JS and CSS assets (#15096) 2020-11-06 11:56:31 +01:00
relationships Merge branch 'master' into glitch-soc/merge-upstream 2020-11-12 22:13:57 +01:00
remote_follow
remote_interaction
settings Merge branch 'master' into glitch-soc/merge-upstream 2020-11-20 13:27:48 +01:00
shared Add honeypot fields and minimum fill-out time for sign-up form (#15276) 2020-12-10 06:27:26 +01:00
shares Add subresource integrity for JS and CSS assets (#15096) 2020-11-06 11:56:31 +01:00
statuses Merge branch 'master' into glitch-soc/merge-upstream 2020-12-05 17:33:37 +01:00
tags Add subresource integrity for JS and CSS assets (#15096) 2020-11-06 11:56:31 +01:00
user_mailer Add WebAuthn as an alternative 2FA method (#14466) 2020-08-24 16:46:27 +02:00
well_known/host_meta Remove dependency on goldfinger gem (#14919) 2020-10-08 00:34:57 +02:00