Claire dd2a991e24 Merge commit '079d681ac6f279f3a7a6be5c3734549f3be8f912' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/material-icons/400-24px/code.svg`: Icon newly-introduced upstream. Used upstream's more recent version. - `app/javascript/material-icons/400-24px/mail.svg`: Icon newly-introduced upstream. Used upstream's more recent version. - `app/javascript/material-icons/400-24px/manufacturing.svg`: Icon newly-introduced upstream. Used upstream's more recent version. - `app/views/admin/settings/shared/_links.html.haml`: Glitch-soc had extra menu items, ported the changes for them too. - `config/navigation.rb`: Glitch-soc had extra menu items, ported the changes for them too.		2024-08-08 19:30:16 +02:00
..
admin	Use `class_names` in admin/account_moderation_notes helper (#30719)	2024-06-17 12:20:57 +00:00
accounts_helper_spec.rb	…
application_helper_spec.rb	Merge commit '079d681ac6f279f3a7a6be5c3734549f3be8f912' into glitch-soc/merge-upstream	2024-08-08 19:30:16 +02:00
flashes_helper_spec.rb	Fix `Rails/I18nLocaleTexts` cop (#27779)	2023-11-09 09:46:39 +00:00
formatting_helper_spec.rb	…
home_helper_spec.rb	Remove remaining `without_partial_double_verification` usage (#28127)	2023-12-07 12:15:50 +00:00
instance_helper_spec.rb	Remove unneeded settings cleanup from specs (#28425)	2023-12-19 15:17:22 +00:00
json_ld_helper_spec.rb	Merge pull request from GHSA-jhrq-qvrm-qr36	2024-02-16 12:17:15 +01:00
languages_helper_spec.rb	Fix language sorting in settings (#27158)	2023-10-04 09:23:50 +02:00
media_component_helper_spec.rb	Remove remaining `without_partial_double_verification` usage (#28127)	2023-12-07 12:15:50 +00:00
react_component_helper_spec.rb	…
routing_helper_spec.rb	…
self_destruct_helper_spec.rb	Add more tests for self-destruct mode (#30374)	2024-05-20 10:06:51 +00:00
settings_helper_spec.rb	…
statuses_helper_spec.rb	Replace more `font-awesome` icons in `app/helpers` (#30962)	2024-08-07 22:53:15 +00:00
theme_helper_spec.rb	Merge commit 'b61ae28f8d4b6f269f50a05c3e65ec7f2c846d32' into glitch-soc/merge-upstream	2024-05-01 18:38:55 +02:00