Claire abfdafef1e Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/auth/setup_controller.rb`: Upstream removed a method close to a glitch-soc theming-related method. Removed the method like upstream did.		2023-04-22 10:06:11 +02: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-16 23:12:59 +01:00
admin_mailer
application	Fix more haml-lint Rubocop (#24107)	2023-03-15 20:07:43 +01:00
auth	Merge branch 'main' into glitch-soc/merge-upstream	2023-04-22 10:06:11 +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-03-15 09:16:10 +01:00
follower_accounts
following_accounts
home
invites
kaminari	Fix missing translation in pagination gap tags (#24262)	2023-03-29 13:54:33 +02:00
layouts	Fix glitch-soc HAML linting issues (#2166)	2023-04-07 20:55:28 +02:00
media	Fix glitch-soc HAML linting issues (#2166)	2023-04-07 20:55:28 +02:00
notification_mailer	Fix more haml-lint Rubocop (#24107)	2023-03-15 20:07:43 +01:00
oauth	Setup haml-lint CI with todo config (#23524)	2023-03-15 04:15:36 +01:00
privacy
relationships	Merge branch 'main' into glitch-soc/merge-upstream	2023-03-05 20:46:56 +01:00
settings	Fix default content type setting not applying (#2176)	2023-04-12 20:12:25 +02:00
shared	Merge branch 'main' into glitch-soc/merge-upstream	2023-03-15 09:16:10 +01:00
shares
statuses	Merge branch 'main' into glitch-soc/merge-upstream	2023-03-16 23:12:59 +01:00
statuses_cleanup
tags	Enable Rubocop for app/views (#23874)	2023-03-05 00:33:52 +01:00
user_mailer	Change user backups to use expiring URLs for download when possible (#24136)	2023-03-16 22:46:52 +01:00
well_known/host_meta	Enable Rubocop for app/views (#23874)	2023-03-05 00:33:52 +01:00