Claire f5c0c32edd Merge commit '9ba7c90151463a6e4f7952317253fe8c113e9b0a' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/material-icons/400-24px/chat.svg`: Glitch-soc used this one but not upstream. Upstream pulled a presumably more up-to-date version of the file. Switched to upstream's version. - `app/views/layouts/application.html.haml`: Upstream removed use of font-awesome. I hope we are ready. - `app/views/layouts/embedded.html.haml`: Upstream removed use of font-awesome. I hope we are ready. - `app/views/layouts/error.html.haml`: Upstream removed use of font-awesome. I hope we are ready.		2024-08-20 18:31:50 +02:00
..
account_actions	Fix haml-lint LineLength cops in app/views/admin (#28680)	2024-03-15 11:19:00 +00:00
account_warnings	Add material design icons to admin/settings views (#27780)	2024-04-23 16:43:49 +00:00
accounts	Use material symbols in table link helper (#31359)	2024-08-20 11:48:15 +00:00
action_logs	Migrate form_tag to form_with in admin and auth views (#30692)	2024-06-14 09:49:10 +00:00
announcements	Use material symbols in table link helper (#31359)	2024-08-20 11:48:15 +00:00
change_emails	Fix more haml-lint Rubocop (#24107)	2023-03-15 20:07:43 +01:00
custom_emojis	Merge commit '079d681ac6f279f3a7a6be5c3734549f3be8f912' into glitch-soc/merge-upstream	2024-08-08 19:30:16 +02:00
dashboard	Add material design icons to admin/settings views (#27780)	2024-04-23 16:43:49 +00:00
disputes/appeals	Refactor appeal partial to avoid brakeman XSS warning (#25880)	2023-10-19 17:25:54 +02:00
domain_allows	Consolidate inclusion of admin js pack link (#26628)	2023-08-24 09:56:23 +02:00
domain_blocks	Use shared form partial for admin/domain_blocks views (#29609)	2024-04-22 12:22:16 +00:00
email_domain_blocks	Convert form_for -> form_with in views (#30700)	2024-06-14 09:54:22 +00:00
export_domain_allows	Fix haml-lint LineLength cops in app/views/admin (#28680)	2024-03-15 11:19:00 +00:00
export_domain_blocks	Convert form_for -> form_with in views (#30700)	2024-06-14 09:54:22 +00:00
follow_recommendations	Move Follow Recommendations to Trends menu, rename to Recommendations & Trends (#31292)	2024-08-10 09:17:10 +00:00
instances	Replace more font-awesome icons in views/admin area (#30961)	2024-08-07 23:08:36 +00:00
invites	Use material symbols in table link helper (#31359)	2024-08-20 11:48:15 +00:00
ip_blocks	Convert form_for -> form_with in views (#30700)	2024-06-14 09:54:22 +00:00
relationships	Convert form_for -> form_with in views (#30700)	2024-06-14 09:54:22 +00:00
relays	Use material symbols in table link helper (#31359)	2024-08-20 11:48:15 +00:00
report_notes	Use material symbols in table link helper (#31359)	2024-08-20 11:48:15 +00:00
reports	Use material symbols in table link helper (#31359)	2024-08-20 11:48:15 +00:00
roles	Use material symbols in table link helper (#31359)	2024-08-20 11:48:15 +00:00
rules	Use material symbols in table link helper (#31359)	2024-08-20 11:48:15 +00:00
settings	Merge commit '079d681ac6f279f3a7a6be5c3734549f3be8f912' into glitch-soc/merge-upstream	2024-08-08 19:30:16 +02:00
software_updates	Solve simplest haml-lint Rubocop lints (#27529)	2023-10-25 12:38:01 +00:00
status_edits	Add material design icons to admin/settings views (#27780)	2024-04-23 16:43:49 +00:00
statuses	Replace more font-awesome icons in views/admin area (#30961)	2024-08-07 23:08:36 +00:00
tags	Implement UI for Admin Search of Hashtags (#30880)	2024-07-29 15:49:44 +00:00
trends	Move Follow Recommendations to Trends menu, rename to Recommendations & Trends (#31292)	2024-08-10 09:17:10 +00:00
users/roles	Fix haml-lint LineLength cops in app/views/admin (#28680)	2024-03-15 11:19:00 +00:00
warning_presets	Use material symbols in table link helper (#31359)	2024-08-20 11:48:15 +00:00
webhooks	Use material symbols in table link helper (#31359)	2024-08-20 11:48:15 +00:00