Claire e53421b548 Merge commit 'e5826777b6c06a32b97388657beaca1e5eccb421' into glitch-soc/merge-upstream ...

Conflicts:
- `config/settings.yml`:
  Not a real conflict, upstream removed settings that are identical in glitch-soc
  but textually adjacent to glitch-soc-only settings.
  Removed what upstream removed.

2025-07-30 20:05:45 +02: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 '3b52dca4057560c58b260433722d91650fcd5040' into glitch-soc/merge-upstream

2025-07-11 18:53:47 +02: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

Remove image_pack_tag usage (#29925)

2024-04-15 09:05:19 +00:00

context_helper.rb

Merge commit '74fc4dbacf5a9168074e91fc2d75309dc42ff1ed' into glitch-soc/merge-upstream

2025-07-15 18:19:32 +02:00

database_helper.rb

Fix ActiveRecord using two connection pools when no replica is defined (#27061)

2023-09-22 16:01:59 +02:00

domain_control_helper.rb

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

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

email_helper.rb

Apply Rubocop Performance/StringReplacement (#23445)

2023-02-08 03:21:21 +01:00

filters_helper.rb

Extract helper methods for labels from filters/_filter_fields (#27574)

2023-11-29 10:02:59 +00:00

flashes_helper.rb

…

formatting_helper.rb

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

2025-07-30 20:05:45 +02:00

home_helper.rb

Use field partial in admin account show view (#35503)

2025-07-25 07:21:08 +00:00

instance_helper.rb

Add icon field to instance endpoint (#30205)

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

invites_helper.rb

Fix haml-lint InstanceVariables rule for invites/_form (#26064)

2023-09-28 15:40:28 +02:00

json_ld_helper.rb

Fix Lint/NonLocalExitFromIterator cop in JSON-LD helper (#34948)

2025-07-28 15:35:37 +00:00

languages_helper.rb

Fix tl language native name (#32606)

2024-10-22 08:41:40 +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

Move direct serializer usage out of admin view partial (#29028)

2024-02-06 13:18:37 +00:00

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

Remove remnants of embed views (#32419)

2024-11-16 20:48:10 +00:00

theme_helper.rb

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

2025-07-30 20:05:45 +02:00