Claire 17ba99e5de Merge commit 'd6f2a3ac8d61e0828a17f68a6e9094d0f4662f4c' into glitch-soc/merge-upstream ...

Conflicts:
- `app/views/wrapstodon/show.html.haml`:
  Conflict because of glitch-soc's theming change.
  Adapted upstream's changes.
- `docker-compose.yml`:
  Conflict because of container repo name change.
  Adapted upstream's changes.
- `yarn.lock`:
  Conflict because of an additional glitch-soc dependency.
  Updated the dependencies upstream did.

2025-12-10 18:05:44 +01: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 '37ccffa95a30772b55e3f18d486d699ee6c5f9e8' into glitch-soc/merge-upstream

2025-11-30 17:47:27 +01:00

locales

Add title and description to Opengraph data for Wrapstodon share page (#37188)

2025-12-10 11:27:10 +00:00

locales-glitch

Update simple_form.no.yml

2025-11-11 12:15:55 +01:00

routes

Merge commit '607449336da198ea9fe9c014220a5374a0ca1ae4' into glitch-soc/merge-upstream

2025-12-08 16:33:27 +01:00

templates

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

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

vite

Merge commit '92278796c3d0fa43c08bd59f66815b196fb273a3' into glitch-soc/merge-upstream

2025-12-02 20:45:10 +01:00

application.rb

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

2025-06-26 12:18:30 +00:00

boot.rb

…

brakeman.yml

…

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

…

formatjs-formatter.js

…

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 'd1f57822af0da2b2836e33baab5f89469ac6fa25' into glitch-soc/merge-upstream

2025-11-03 21:04:45 +01:00

omniauth.yml

Use config_for for omniauth enabled values (#35015)

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

pghero.yml

…

puma.rb

Rely on puma default environment setting (#36760)

2025-11-07 10:06:22 +00:00

roles.yml

Add disabled setting for live and topic feeds, as well as user permission to bypass that (#36563)

2025-10-23 08:37:05 +00:00

routes.rb

Add shareable wrapstodon links (#37047)

2025-12-03 11:00:41 +00:00

settings.yml

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

2025-10-28 20:25:09 +01: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