Claire 97ff0f94bf Merge commit 'a8109e50fc313b8124a3e471d41b490df59a68b8' into glitch-soc/merge-upstream ...

Conflicts:
- `app/views/settings/preferences/appearance/show.html.haml`:
  Upstream changed a field that was moved to another page due to glitch-soc's theming system.
  Ignored this one change.

2025-12-18 18:10:30 +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 'cbe135210305c0ce4455130c4e75680e53ff1425' into glitch-soc/merge-upstream

2025-12-15 20:22:20 +01:00

locales

New Crowdin Translations (automated) (#37293)

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

locales-glitch

Update simple_form.no.yml

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

routes

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

2025-12-15 20:22:20 +01:00

templates

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

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

vite

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

2025-12-15 20:22:20 +01:00

application.rb

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

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

boot.rb

Upgrade rubocop-rails from 2.33.4 to 2.34.2 and address related offenses (#37243)

2025-12-15 12:57:16 +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 '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

Fix default Admin role not including view_feeds permission (#37301)

2025-12-18 14:26:31 +00:00

routes.rb

Add shareable wrapstodon links (#37047)

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

settings.yml

Merge commit '009275e66b55729f754da7b4c814b37b67dc76dc' into glitch-soc/merge-upstream

2025-12-17 18:27:14 +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