Claire 26193a119b Merge commit 'd9b70bbde13b78709b48be6c979bc7520e81520a' into glitch-soc/merge-upstream ...

Conflicts:
- `app/helpers/application_helper.rb`:
  Upstream added a helper close to a glitch-soc one.
  Added upstream's helper.

2025-09-16 18:30:30 +02:00

..

about

Fix titles being escaped twice (#32889)

2024-11-14 13:28:00 +00:00

accounts

Fix titles being escaped twice (#32889)

2024-11-14 13:28:00 +00:00

admin

Merge commit '1b664cf20dbb696cf16a42efcf59ab186cb211eb' into glitch-soc/merge-upstream

2025-09-05 20:03:42 +02:00

admin_mailer

Change hashtag trends to be stored in the database instead of redis (#32837)

2024-12-04 11:59:17 +00:00

application

Merge commit '02de05dc272856c77fac5c9e1d84cf585ae20c1e' into glitch-soc/merge-upstream

2025-08-27 18:13:03 +02:00

auth

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

2025-09-16 18:30:30 +02:00

custom_css

Remove role color highlighting from custom css (#33493)

2025-01-07 16:28:35 +00:00

disputes/strikes

Include time portion in formatted datetimes when provided (#33191)

2025-01-08 14:26:08 +00:00

errors

…

filters

Use default action of persisted records on edit forms (#35904)

2025-08-25 17:26:25 +00:00

follower_accounts

…

following_accounts

…

home

…

invites

Fix missing button styles on some forms (#33771)

2025-01-29 10:36:24 +00:00

kaminari

Migrate fontawesome->material in more views (#31360)

2024-08-20 11:52:45 +00:00

layouts

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

2025-09-16 18:30:30 +02:00

mail_subscriptions

Fix missing button styles on some forms (#33771)

2025-01-29 10:36:24 +00:00

media

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

2025-05-25 14:36:51 +02:00

notification_mailer

Change icon of quote notification mails (#35701)

2025-08-06 15:20:16 +00:00

oauth

Fix missing button styles on some forms (#33771)

2025-01-29 10:36:24 +00:00

privacy

Fix titles being escaped twice (#32889)

2024-11-14 13:28:00 +00:00

redirects

Change referrer policy to be controlled by header in web UI (#33214)

2024-12-09 22:42:45 +00:00

relationships

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

2025-05-25 14:36:51 +02:00

remote_interaction_helper

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

2025-05-25 14:36:51 +02:00

settings

Merge commit '45a996f12b04f88e0774bc6d6b52452ce39b612f' into glitch-soc/merge-upstream

2025-09-11 21:20:15 +02:00

severed_relationships

Use partial for severed relationship download area (#35945)

2025-08-29 15:19:59 +00:00

shared

Merge commit '54ad57ea9527a58ac2b95159ed178ed7c737a89c' into glitch-soc/merge-upstream

2025-05-30 17:41:31 +02:00

shares

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

2025-05-25 14:36:51 +02:00

statuses

Add schema.org markup to SEO-enabled posts (#36075)

2025-09-12 09:12:07 +00:00

statuses_cleanup

Disable irrelevant fields unless cleanup is enabled (#26562)

2024-08-04 08:57:46 +00:00

tags

Add rel alternate rss/json links to tags show html page (#33179)

2024-12-05 11:34:49 +00:00

terms_of_service

Add terms of service (#33055)

2024-12-09 10:04:46 +00:00

terms_of_service_interstitial

Add interstitial for Terms of Service updates (#34527)

2025-05-16 14:03:05 +00:00

user_mailer

Remove unused local vars from user mailer warning (#35977)

2025-09-02 07:35:53 +00:00

well_known/host_meta

…