Claire d8fdbb054e Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/validators/status_length_validator.rb`: Upstream changes too close to glitch-soc MAX_CHARS changes, but not a real conflict. Applied upstream changes. - `package.json`: glitch-soc-only dependency textually too close to a dependency updated upstream, not a real conflict. Applied upstream changes.		2021-03-02 12:06:58 +01:00
..
about	Merge branch 'main' into glitch-soc/merge-upstream	2021-03-02 12:06:58 +01:00
accounts	Merge branch 'master' into glitch-soc/merge-upstream	2020-11-07 18:23:02 +01:00
admin	Merge branch 'main' into glitch-soc/merge-upstream	2021-03-02 12:06:58 +01:00
admin_mailer	…
application	Fix lock icon not being shown when locking account in profile settings (#14190)	2020-07-01 13:51:50 +02:00
auth	Merge branch 'master' into glitch-soc/merge-upstream	2020-12-15 14:27:06 +01:00
authorize_interactions	…
directories	Merge branch 'master' into glitch-soc/merge-upstream	2020-05-13 22:11:49 +02:00
errors	…
filters	…
follower_accounts	…
following_accounts	…
home	Merge branch 'main' into glitch-soc/merge-upstream	2021-01-21 16:51:12 +01:00
invites	…
kaminari	…
layouts	Merge branch 'main' into glitch-soc/merge-upstream	2021-02-12 10:28:32 +01:00
media	Merge branch 'master' into glitch-soc/merge-upstream	2021-01-06 18:08:06 +01:00
notification_mailer	Change RTL detection to rely on unicode-bidi paragraph by paragraph (#14573)	2020-12-15 12:56:43 +01:00
oauth	Refactor settings controllers (#14767)	2020-09-11 20:56:35 +02:00
public_timelines	Merge branch 'main' into glitch-soc/merge-upstream	2021-01-21 16:51:12 +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	2021-01-06 18:08:06 +01:00
tags	Merge branch 'main' into glitch-soc/merge-upstream	2021-01-21 16:51:12 +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