Claire 23ce6d326c Merge commit '129e72b91494f30777cf4fa8a0905de2dccedba7' into glitch-soc/merge-upstream ...

Conflicts:
- `app/helpers/formatting_helper.rb`:
  Upstream removed OTel instrumentation around some code modified in glitch-soc
  because of the Markdown rendering feature.
  Removed the OTel instrumentation as upstream did.

2025-06-03 18:34:37 +02:00

..

environments

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

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

imagemagick

Drop favicon.ico generation (#30375)

2024-06-26 13:44:08 +00:00

initializers

Merge commit '129e72b91494f30777cf4fa8a0905de2dccedba7' into glitch-soc/merge-upstream

2025-06-03 18:34:37 +02:00

locales

New Crowdin Translations (automated) (#34874)

2025-06-02 08:24:52 +00:00

locales-glitch

New Crowdin Translations (automated) (#2970)

2025-04-12 11:47:50 +02:00

routes

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

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

templates

Add min. age to terms of service (#34105)

2025-03-07 11:50:52 +00:00

vite

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

2025-05-27 20:49:19 +02:00

application.rb

Use config_for for cache buster values (#34851)

2025-05-30 11:54:25 +00:00

boot.rb

Use abort instead of warn(); exit in boot.rb env check (#29209)

2024-02-16 14:29:24 +00:00

brakeman.yml

Configure brakeman to ignore url safe preview card urls (#25883)

2023-10-20 15:32:16 +02:00

cache_buster.yml

Use config_for for cache buster values (#34851)

2025-05-30 11:54:25 +00:00

captcha.yml

Move hcaptcha service config to config_for yml (#30662)

2024-10-23 14:25:43 +00:00

database.yml

Update sidekiq to version 7 (#34745)

2025-05-26 15:32:41 +00:00

environment.rb

Enable Rubocop Style/FrozenStringLiteralComment (#23793)

2023-07-12 09:47:08 +02:00

formatjs-formatter.js

Merge commit '44cd88adc4e2f4028dcc2b08b98368f0dc90cee4' into glitch-soc/merge-upstream

2023-06-10 12:38:33 +02:00

i18n-tasks.yml

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

2024-10-06 16:07:58 +02:00

mastodon.yml

Merge commit '420ffdfb6259740602d4ce727ed5c60432c776a5' into glitch-soc/merge-upstream

2025-03-11 18:44:32 +01:00

navigation.rb

Merge commit '902aab1245a06319b7acd20045bd9ce051627300' into glitch-soc/merge-upstream

2025-03-29 17:02:39 +01:00

pghero.yml

…

puma.rb

Add an optional metric exporter (#33734)

2025-01-27 12:52:30 +00:00

roles.yml

…

routes.rb

Adds featured tab to web (#34405)

2025-04-10 15:40:30 +00:00

settings.yml

Merge commit '877090518682b6c77ba9bdfa0231afd56daec44d' into glitch-soc/merge-upstream

2024-12-25 18:01:37 +01:00

sidekiq.yml

Add support for FASP data sharing (#34415)

2025-05-16 12:24:02 +00:00

translation.yml

Move translation service config to config_for yml (#30663)

2024-10-23 13:32:18 +00:00

vapid.yml

Use config_for for VAPID key storage (#34845)

2025-05-30 07:00:33 +00:00

vite.json

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

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