Thibaut Girka c077cdaba7 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/relationships_controller.rb`: Upstream changed a line too close to a glitch-soc only line related to glitch-soc's theming system. Applied upstream changes accordingly.		2020-11-12 22:13:57 +01:00
..
about	Add subresource integrity for JS and CSS assets (#15096)	2020-11-06 11:56:31 +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	Add subresource integrity for JS and CSS assets (#15096)	2020-11-06 11:56:31 +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	Add subresource integrity for JS and CSS assets (#15096)	2020-11-06 11:56:31 +01:00
shared	…
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-11-07 18:23:02 +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