Claire 57c0de949b Merge commit '8b770ce8110e6cd609a6769c66210d95e291e3e5' into glitch-soc/merge-upstream ... Conflicts: - `config/initializers/content_security_policy.rb`: Upstream changed how asset host CSP directives are used, and glitch-soc has a pretty different CSP file. It may be worth reconsidering the differences between upstream and glitch-soc but for now, just port the change.		2023-10-24 19:17:20 +02:00
..
about	…
accounts	Fix haml-lint Rubocop `Style/SlicingWithRange` cop (#25947)	2023-07-17 18:18:13 +02:00
admin	Merge commit '8b770ce8110e6cd609a6769c66210d95e291e3e5' into glitch-soc/merge-upstream	2023-10-24 19:17:20 +02:00
admin_mailer	Add timezone to datetimes in e-mails (#26822)	2023-09-06 17:25:39 +02:00
application	Add card with who invited you to join when displaying rules on sign-up (#23475)	2023-06-02 18:35:37 +02:00
auth	Merge commit '77098c6f1c25958960df98a1510b28352a39704f' into glitch-soc/merge-upstream	2023-10-17 20:59:18 +02:00
custom_css	Add role badges to the WebUI (#25649)	2023-07-27 16:05:24 +02:00
disputes/strikes	Extract `card` partial from `disputes/strikes/show` view (#27426)	2023-10-16 16:04:29 +02:00
errors	…
filters	Merge branch 'main' into glitch-soc/merge-upstream	2023-07-17 19:02:23 +02:00
follower_accounts	…
following_accounts	…
home	…
invites	Fix haml-lint `InstanceVariables` rule for invites/_form (#26064)	2023-09-28 15:40:28 +02:00
kaminari	Fix missing translation in pagination gap tags (#24262)	2023-03-29 13:54:33 +02:00
layouts	Consolidate inclusion of `admin` js pack link (#26628)	2023-08-24 09:56:23 +02:00
mail_subscriptions	Add unsubscribe link to e-mails (#25378)	2023-06-12 14:22:46 +02:00
media	Merge commit '144a406d332b034caa812ade2629df03ed4898d7' into glitch-soc/merge-upstream	2023-07-30 13:42:06 +02:00
notification_mailer	Add timezone to datetimes in e-mails (#26822)	2023-09-06 17:25:39 +02:00
oauth	Add role badges to the WebUI (#25649)	2023-07-27 16:05:24 +02:00
privacy	…
relationships	Merge commit '77098c6f1c25958960df98a1510b28352a39704f' into glitch-soc/merge-upstream	2023-10-17 20:59:18 +02:00
remote_interaction_helper	Fix interaction modal being broken because of glitch-soc's theming system	2023-07-30 16:45:50 +02:00
settings	Merge commit '40ba6e119b7457161fd43b449875d0fb9d473c1a' into glitch-soc/merge-upstream	2023-10-08 17:26:43 +02:00
shared	Merge commit '5393be7a21331c8615ffb79c2271db92f6959458' into glitch-soc/merge-upstream	2023-10-08 16:48:19 +02:00
shares	…
statuses	Merge commit 'c676bc91e9c3aa81eb7cfbce3c5c5e80b84d3d02' into glitch-soc/merge-upstream	2023-10-08 17:21:12 +02:00
statuses_cleanup	Fix haml-lint Rubocop `lambda` cop (#25946)	2023-07-17 15:07:29 +02:00
tags	Enable Rubocop Style/FrozenStringLiteralComment (#23793)	2023-07-12 09:47:08 +02:00
user_mailer	Fix haml-lint Rubocop `Rails/*` cops (#26042)	2023-10-03 15:00:40 +02:00
well_known/host_meta	Rubocop fix: `Perfomance/UnfreezeString` (#26217)	2023-07-28 23:11:05 +02:00