Claire 4fbd1ad7ae Merge commit 'd13d7b4566d551d027830f7dfc987ba3a8e2dd4f' into glitch-soc/merge-upstream ...

Conflicts are too numerous to list, but they are all caused by upstream's
theming changes and all have to do with the differences between upstream and
glitch-soc in the theming systems.

They were all manually resolved by adapting the relevant code.

2026-02-11 13:32:18 +01:00

..

admin

Add ability to block words in usernames (#35407)

2025-07-29 10:19:15 +00:00

accounts_helper.rb

Merge commit '24ef8255b3f9b44cb54f49bc78fe3382a7070b1a' into glitch-soc/merge-upstream

2024-09-12 20:05:08 +02:00

application_helper.rb

Merge commit 'd13d7b4566d551d027830f7dfc987ba3a8e2dd4f' into glitch-soc/merge-upstream

2026-02-11 13:32:18 +01:00

authorized_fetch_helper.rb

Move "limited federation mode" config to x.mastodon area (#35041)

2025-06-16 06:13:03 +00:00

branding_helper.rb

…

context_helper.rb

Merge commit '591df1f205c654381203b56d46498efc62370776' into glitch-soc/merge-upstream

2025-08-01 22:11:59 +02:00

database_helper.rb

Add REPLICA_DB_HOST to replica_enabled helper (#37240)

2025-12-15 13:25:42 +00:00

domain_control_helper.rb

Move "limited federation mode" config to x.mastodon area (#35041)

2025-06-16 06:13:03 +00:00

filters_helper.rb

Extract filter_keywords helper method for listing filter keyword groups (#35921)

2025-12-17 14:48:58 +00:00

flashes_helper.rb

…

formatting_helper.rb

Merge commit '624c024766227255c78d31bd408876c64a8b279f' into glitch-soc/merge-upstream

2025-09-03 14:39:57 +02:00

home_helper.rb

Link to local accounts from settings (#36340)

2025-10-06 14:10:26 +00:00

instance_helper.rb

Add icon field to instance endpoint (#30205)

2024-08-22 10:04:27 +00:00

invites_helper.rb

…

json_ld_helper.rb

Change: Consolidate collection handling in jsonld helper (#34595)

2026-02-09 15:19:36 +00:00

languages_helper.rb

Add nan-TW to interface languages (#34923)

2026-01-28 17:56:29 +00:00

media_component_helper.rb

Change media attachments in moderated posts to not be accessible (#34872)

2025-06-12 08:53:02 +00:00

react_component_helper.rb

…

registration_helper.rb

Use enum-generated IpBlock.severity... scopes (#31210)

2024-11-08 14:23:52 +00:00

routing_helper.rb

Change media attachments in moderated posts to not be accessible (#34872)

2025-06-12 08:53:02 +00:00

self_destruct_helper.rb

Move self destruct check to config_for and add constant for verifier string (#32943)

2024-11-18 09:57:16 +00:00

settings_helper.rb

Only show recently used tags hint when they are present (#32120)

2024-09-27 08:18:42 +00:00

statuses_helper.rb

Implement quote posts in Moderator UI (#35964)

2025-10-16 13:40:24 +00:00

theme_helper.rb

Merge commit 'd13d7b4566d551d027830f7dfc987ba3a8e2dd4f' into glitch-soc/merge-upstream

2026-02-11 13:32:18 +01:00

wrapstodon_helper.rb

Updates Wrapstodon footer with dedicated local server info (#37270)

2025-12-16 15:35:26 +00:00