Claire 193250556c 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.		2023-03-16 23:12:59 +01: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
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	Add confirmation page when importing blocked domains (#1773)	2022-05-16 18:26:49 +02: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
ip_blocks
relationships	Fix IDN domains not being rendered correctly in a few left-over places (#17848)	2022-03-22 10:07:11 +01:00
relays
report_notes	Change account moderation notes to make links clickable (#22553)	2023-01-18 16:32:23 +01:00
reports	Merge branch 'main' into glitch-soc/merge-upstream	2023-03-15 09:16:10 +01: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 branch 'main' into glitch-soc/merge-upstream	2023-02-09 12:46:12 +01: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