Claire ad1098970b Merge commit 'bec6a1cad4c509c53deb378c7ba984ba7e2de5a9' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/auth/confirmations_controller.rb`: Upstream merged our captcha code, but there are some conflicts due to glitch-soc's theming system. - `app/views/admin/settings/registrations/show.html.haml`: Upstream merged our captcha code, but there are some conflicts due to glitch-soc's theming system. Additional changes: - `Gemfile`: Upstream added hcaptcha dependency in another place in the file. - `config/settings.yml`: Upstream added the `captcha_enabled` setting in another place in the file.		2023-05-25 22:49:18 +02:00
..
account_actions	Fix more haml-lint Rubocop (#24107)	2023-03-15 20:07:43 +01:00
account_warnings	Fix IDN domains not being rendered correctly in a few left-over places (#17848)	2022-03-22 10:07:11 +01:00
accounts	Merge branch 'main' into glitch-soc/merge-upstream	2023-03-16 23:12:59 +01:00
action_logs	Merge branch 'main' into glitch-soc/merge-upstream	2023-03-16 23:12:59 +01:00
announcements	Merge branch 'main' into glitch-soc/merge-upstream	2023-03-15 09:16:10 +01:00
change_emails	Fix more haml-lint Rubocop (#24107)	2023-03-15 20:07:43 +01:00
custom_emojis	Merge branch 'main' into glitch-soc/merge-upstream	2023-03-16 23:12:59 +01:00
dashboard	Merge branch 'main' into glitch-soc/merge-upstream	2023-03-16 23:12:59 +01:00
disputes/appeals	Merge branch 'main' into glitch-soc/merge-upstream	2023-03-15 09:16:10 +01:00
domain_allows	Add subresource integrity for JS and CSS assets (#15096)	2020-11-06 11:56:31 +01:00
domain_blocks	Merge branch 'main' into glitch-soc/merge-upstream	2022-03-10 09:52:45 +01:00
email_domain_blocks	Adapt view for glitch-soc's theming system	2022-02-26 09:46:13 +01:00
export_domain_allows	Support for import/export of instance-level domain blocks/allows for 4.x w/ additional fixes (#20597)	2022-11-17 11:05:09 +01:00
export_domain_blocks	Fix issue with glitch-soc theming	2022-12-15 20:30:46 +01:00
follow_recommendations	Merge branch 'main' into glitch-soc/merge-upstream	2022-02-26 09:29:23 +01:00
instances	Merge branch 'main' into glitch-soc/merge-upstream	2023-03-15 09:16:10 +01:00
invites	Fix maxed-out invites not showing up as expired in UI (#10274)	2019-03-15 05:35:17 +01:00
ip_blocks	Merge branch 'main' into glitch-soc/merge-upstream	2021-12-16 16:20:44 +01:00
relationships	Fix IDN domains not being rendered correctly in a few left-over places (#17848)	2022-03-22 10:07:11 +01:00
relays	Display pending message on admin relays UI (#8494)	2018-08-28 05:39:43 +02:00
report_notes	Change account moderation notes to make links clickable (#22553)	2023-01-18 16:32:23 +01:00
reports	Merge commit '2ce0b666a139726dc406e6c1887728553b947e59' into glitch-soc/merge-upstream	2023-05-25 20:43:25 +02:00
roles	Use type="color" on badge color input field (#18825)	2022-08-25 04:38:34 +02:00
rules	Setup haml-lint CI with todo config (#23524)	2023-03-15 04:15:36 +01:00
settings	Merge commit 'bec6a1cad4c509c53deb378c7ba984ba7e2de5a9' into glitch-soc/merge-upstream	2023-05-25 22:49:18 +02:00
status_edits	Add ability to view previous edits of a status in admin UI (#19462)	2022-10-26 13:42:29 +02:00
statuses	Merge branch 'main' into glitch-soc/merge-upstream	2023-03-05 20:46:56 +01:00
tags	Merge branch 'main' into glitch-soc/merge-upstream	2022-07-17 22:07:20 +02:00
trends	Merge branch 'main' into glitch-soc/merge-upstream	2023-01-12 10:15:46 +01:00
users/roles	Add customizable user roles (#18641)	2022-07-05 02:41:40 +02:00
warning_presets	Setup haml-lint CI with todo config (#23524)	2023-03-15 04:15:36 +01:00
webhooks	Setup haml-lint CI with todo config (#23524)	2023-03-15 04:15:36 +01:00