Claire bd349cb850 Merge commit 'ce1f35d7e213327549b960bb64f63c67a141ea40' into glitch-soc/merge-upstream ... Conflicts: - `db/schema.rb`: Upstream regenerated the schema file using Rails 7, the conflicts are caused by our extra columns. Applied upstream's changes, but keeping our extra columns.		2023-07-30 14:58:56 +02:00
..
about
accounts	Fix haml-lint Rubocop Style/SlicingWithRange cop (#25947)	2023-07-17 18:18:13 +02:00
admin	Merge commit 'cfd50f30bb5dda4dd90e1ad01f3e62c99135c36f' into glitch-soc/merge-upstream	2023-07-30 14:33:28 +02:00
admin_mailer	Consistently use middle dot (·) instead of bullet (•) to separate items (#25248)	2023-06-02 19:58:18 +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 branch 'main' into glitch-soc/merge-upstream	2023-07-19 07:35:51 +02:00
authorize_interactions
custom_css
disputes/strikes	Fix incorrect post links in strikes when the account is remote (#23611)	2023-03-15 04:14:47 +01:00
errors
filters	Merge branch 'main' into glitch-soc/merge-upstream	2023-07-17 19:02:23 +02:00
follower_accounts	Change public accounts pages to mount the web UI (#19319)	2022-10-20 14:35:29 +02:00
following_accounts
home
invites	Fix haml-lint Rubocop lambda cop (#25946)	2023-07-17 15:07:29 +02:00
kaminari	Fix missing translation in pagination gap tags (#24262)	2023-03-29 13:54:33 +02:00
layouts	Merge commit '144a406d332b034caa812ade2629df03ed4898d7' into glitch-soc/merge-upstream	2023-07-30 13:42:06 +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	Fix haml-lint Rubocop Style/NumericPredicate cop (#26040)	2023-07-20 15:13:06 +02:00
oauth	Consistently use middle dot (·) instead of bullet (•) to separate items (#25248)	2023-06-02 19:58:18 +02:00
privacy
relationships	Merge branch 'main' into glitch-soc/merge-upstream	2023-03-05 20:46:56 +01:00
settings	Merge commit 'ce1f35d7e213327549b960bb64f63c67a141ea40' into glitch-soc/merge-upstream	2023-07-30 14:58:56 +02:00
shared	Merge commit '144a406d332b034caa812ade2629df03ed4898d7' into glitch-soc/merge-upstream	2023-07-30 13:42:06 +02:00
shares
statuses	Merge commit '1e3b19230a48174acf524cf1a9f5a498e220ea7d' into glitch-soc/merge-upstream	2023-07-30 13:15:01 +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 ArgumentError in mailers when a user's timezone is blank (#26025)	2023-07-17 12:10:50 +02:00
well_known/host_meta	Enable Rubocop Style/FrozenStringLiteralComment (#23793)	2023-07-12 09:47:08 +02:00