Claire b28ce2424c Merge commit 'c40ab43dc703be988c277d4ba6b7987a3a80e16c' into glitch-soc/merge-upstream ... Conflicts: - `app/helpers/application_helper.rb`: Upstream added a helper where glitch-soc had its own, not really a conflict. Added upstream's helper. - `lib/sanitize_ext/sanitize_config.rb`: Upstream renamed a constant that was used slightly differently in glitch-soc. Renamed it as upstream did.		2024-10-06 16:07:58 +02:00
..
about	Change public accounts pages to mount the web UI (#19319)	2022-10-20 14:35:29 +02:00
accounts	Avoid unnecessary i-var for account rss page url generation (#28092)	2023-11-28 08:19:08 +00:00
admin	Merge commit 'c40ab43dc703be988c277d4ba6b7987a3a80e16c' into glitch-soc/merge-upstream	2024-10-06 16:07:58 +02:00
admin_mailer	Fix string interpolation for software updates admin mailer (#30035)	2024-04-23 12:54:52 +00:00
application	Merge commit '9ba7c90151463a6e4f7952317253fe8c113e9b0a' into glitch-soc/merge-upstream	2024-08-20 18:31:50 +02:00
auth	Merge commit '9d664f87a04b6a5157ddbe60ee33b5b7a960198e' into glitch-soc/merge-upstream	2024-09-29 11:06:09 +02:00
custom_css	Spec coverage for custom css endpoint (#28706)	2024-01-12 09:19:25 +00:00
disputes/strikes	Fix recently-broken admin interface buttons (#32240)	2024-10-03 16:12:15 +00:00
errors	Use existing config access to local_domain value (#30509)	2024-06-03 09:15:58 +00:00
filters	Remove fa_ prefix from status visibility icon method (#31846)	2024-09-11 07:47:16 +00:00
follower_accounts	Change public accounts pages to mount the web UI (#19319)	2022-10-20 14:35:29 +02:00
following_accounts	Change public accounts pages to mount the web UI (#19319)	2022-10-20 14:35:29 +02:00
home	Change public accounts pages to mount the web UI (#19319)	2022-10-20 14:35:29 +02:00
invites	Add copyable_input helper method to wrap shared options (#32119)	2024-10-02 14:45:54 +00:00
kaminari	Migrate fontawesome->material in more views (#31360)	2024-08-20 11:52:45 +00:00
layouts	Merge commit '24ef8255b3f9b44cb54f49bc78fe3382a7070b1a' into glitch-soc/merge-upstream	2024-09-12 20:05:08 +02:00
mail_subscriptions	Migrate form_tag to form_with in admin and auth views (#30692)	2024-06-14 09:49:10 +00:00
media	Merge commit '7335a43b6dac0e82c305ce4dec9db4da114c769e' into glitch-soc/merge-upstream	2024-09-06 19:25:31 +02:00
notification_mailer	Update follow and follow_request emails (#28755)	2024-01-17 14:37:04 +00:00
oauth	Add copyable_input helper method to wrap shared options (#32119)	2024-10-02 14:45:54 +00:00
privacy	Change public accounts pages to mount the web UI (#19319)	2022-10-20 14:35:29 +02:00
redirects	Move redirect/base body class to view (#31796)	2024-09-12 13:31:50 +00:00
relationships	Merge commit '9ba7c90151463a6e4f7952317253fe8c113e9b0a' into glitch-soc/merge-upstream	2024-08-20 18:31:50 +02:00
remote_interaction_helper	Replace use_pack, layouts/theme and @theme by new helpers	2024-04-28 15:45:42 +02:00
settings	Merge commit 'c40ab43dc703be988c277d4ba6b7987a3a80e16c' into glitch-soc/merge-upstream	2024-10-06 16:07:58 +02:00
severed_relationships	Wrap datetime in time element with attrs (#32177)	2024-10-01 12:45:58 +00:00
shared	Merge commit '0622107449e72d35b22afeeba2f0ba983e914803' into glitch-soc/merge-upstream	2024-05-01 19:16:48 +02:00
shares	Replace use_pack, layouts/theme and @theme by new helpers	2024-04-28 15:45:42 +02:00
statuses	Change embedded posts to use web UI (#31766)	2024-09-12 09:41:19 +00:00
statuses_cleanup	Disable irrelevant fields unless cleanup is enabled (#26562)	2024-08-04 08:57:46 +00:00
tags	Enable Rubocop Style/FrozenStringLiteralComment (#23793)	2023-07-12 09:47:08 +02:00
user_mailer	Mailer layout fixes (#32132)	2024-09-27 19:41:41 +00:00
well_known/host_meta	Rubocop fix: Perfomance/UnfreezeString (#26217)	2023-07-28 23:11:05 +02:00
.rubocop.yml	Solve simplest haml-lint Rubocop lints (#27529)	2023-10-25 12:38:01 +00:00