Claire 7623e18124 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Upstream README has been changed, but we have a completely different one. Kept our `README.md`. - `lib/sanitize_ext/sanitize_config.rb`: Upstream added support for more incoming HTML tags (a large subset of what glitch-soc accepts). Change the code style to match upstream's but otherwise do not change our code. - `spec/lib/sanitize_config_spec.rb`: Upstream added support for more incoming HTML tags (a large subset of what glitch-soc accepts). Kept our version, since the tests are mostly glitch-soc's, except for cases which are purposefuly different.		2023-03-05 20:46:56 +01:00
..
about
accounts	Enable Rubocop for app/views (#23874)	2023-03-05 00:33:52 +01:00
admin	Merge branch 'main' into glitch-soc/merge-upstream	2023-03-05 20:46:56 +01:00
admin_mailer
application
auth	Fix incorrect translation string in glitch-soc captcha feature	2023-02-19 11:02:27 +01:00
authorize_interactions
custom_css
disputes/strikes
errors
filters
follower_accounts
following_accounts
home
invites
kaminari
layouts
media
notification_mailer
oauth
privacy
relationships	Merge branch 'main' into glitch-soc/merge-upstream	2023-03-05 20:46:56 +01:00
settings	Merge branch 'main' into glitch-soc/merge-upstream	2023-01-25 17:26:38 +01:00
shared
shares
statuses	Merge branch 'main' into glitch-soc/merge-upstream	2023-02-03 19:23:27 +01:00
statuses_cleanup
tags	Enable Rubocop for app/views (#23874)	2023-03-05 00:33:52 +01:00
user_mailer	User mailer spec coverage improvements (#23905)	2023-03-04 17:16:11 +01:00
well_known/host_meta	Enable Rubocop for app/views (#23874)	2023-03-05 00:33:52 +01:00