Claire e8fe33f273 Merge commit '7aba79ade9bfeb86105aa575bc7156acef78f7da' into glitch-soc/merge-upstream ...

Conflicts:
- `app/views/layouts/application.html.haml`:
  Conflict because of glitch-soc's theming system.
  Updated the line as upstream did.

2025-08-25 22:15:28 +02:00

..

environments

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

2025-07-24 18:10:38 +02:00

imagemagick

Drop favicon.ico generation (#30375)

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

initializers

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

2025-08-22 22:33:11 +02:00

locales

Consolidate labels for quote policy settings (#35893)

2025-08-25 12:30:37 +00:00

locales-glitch

New Crowdin Translations (automated) (#3041)

2025-06-16 20:07:18 +02:00

routes

Merge commit '72bd1ed4b3df9188a1ad3e664c86fe2e928bd134' into glitch-soc/merge-upstream

2025-08-18 13:44:06 +02:00

templates

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

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

vite

Fix glitch assets not being found

2025-07-23 12:48:45 +02:00

application.rb

Move email env var reading to yml files (#35191)

2025-06-26 12:18:30 +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

Fix support for special characters in various environment variables (#35314)

2025-07-09 08:58:41 +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

email.yml

Fix support for special characters in various environment variables (#35314)

2025-07-09 08:58: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 'e5826777b6c06a32b97388657beaca1e5eccb421' into glitch-soc/merge-upstream

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

mastodon.yml

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

2025-07-10 01:10:32 +02:00

navigation.rb

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

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

omniauth.yml

Use config_for for omniauth enabled values (#35015)

2025-06-24 09:32:13 +00:00

pghero.yml

…

puma.rb

Start local prometheus_exporter server only in puma/sidekiq startup (#35005)

2025-06-11 13:37:59 +00:00

roles.yml

…

routes.rb

Add support for local quote stamps (#35626)

2025-08-01 14:55:25 +00:00

settings.yml

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

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

sidekiq.yml

Fix incorrect name in scheduler configuration (#35263)

2025-07-04 07:51:01 +00:00

translation.yml

Fix support for special characters in various environment variables (#35314)

2025-07-09 08:58:41 +00:00

vapid.yml

Fix support for special characters in various environment variables (#35314)

2025-07-09 08:58:41 +00:00

vite.json

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

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