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 488cd37f1a Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Upstream changed their README, we have our own. Kept ours. - `app/helpers/application_helper.rb`: Minor code style fix upstream, on a line that is different in glitch-soc due to the different theming system. Applied the code style fix to our own code. - `app/views/settings/preferences/appearance/show.html.haml`: Code style fix on a line next to lines exclusive to glitch-soc. Applied upstream changes. - `yarn.lock`: Upstream updated a dependency textually close to a glitch-soc-only dependency. Updated the dependency like upstream did.		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 branch 'main' 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 branch 'main' 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