You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Claire 9e224add8a Merge commit '844d8e101e84cc1c27c99005b7059a975ac826ca' 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.		2 years ago
..
account_actions	Fix more haml-lint Rubocop (#24107)	2 years ago
account_warnings	Fix IDN domains not being rendered correctly in a few left-over places (#17848)	3 years ago
accounts	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
action_logs	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
announcements	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
change_emails	Fix more haml-lint Rubocop (#24107)	2 years ago
custom_emojis	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
dashboard	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
disputes/appeals	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
domain_allows	Add subresource integrity for JS and CSS assets (#15096)	4 years ago
domain_blocks	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
email_domain_blocks	Adapt view for glitch-soc's theming system	3 years ago
export_domain_allows	Support for import/export of instance-level domain blocks/allows for 4.x w/ additional fixes (#20597)	2 years ago
export_domain_blocks	Fix issue with glitch-soc theming	2 years ago
follow_recommendations	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
instances	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
invites	Fix maxed-out invites not showing up as expired in UI (#10274)	6 years ago
ip_blocks	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
relationships	Fix IDN domains not being rendered correctly in a few left-over places (#17848)	3 years ago
relays	Display pending message on admin relays UI (#8494)	6 years ago
report_notes	Change account moderation notes to make links clickable (#22553)	2 years ago
reports	Merge commit 'afb74b97b237a32c5e1db2a6a9968d587a3d5dd3' into glitch-soc/merge-upstream	2 years ago
roles	Use type="color" on badge color input field (#18825)	2 years ago
rules	Setup haml-lint CI with todo config (#23524)	2 years ago
settings	Merge commit '844d8e101e84cc1c27c99005b7059a975ac826ca' into glitch-soc/merge-upstream	2 years ago
status_edits	Add ability to view previous edits of a status in admin UI (#19462)	2 years ago
statuses	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
tags	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
trends	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
users/roles	Add customizable user roles (#18641)	2 years ago
warning_presets	Setup haml-lint CI with todo config (#23524)	2 years ago
webhooks	Setup haml-lint CI with todo config (#23524)	2 years ago