Claire 93bdb16817 Merge commit '8ba1487f30685fff4555a7537d3e6c765c73a07c' into glitch-soc/merge-upstream ...

Conflicts:
- `spec/models/concerns/account/interactions_spec.rb`:
  Conflict due to glitch-soc having modified specs ages ago.
  The covered code is the same as upstream, though.
  Took upstream's version of the specs.
- `spec/models/status_spec.rb`:
  Conflict because glitch-soc tests for an extra glitch-soc-specific
  method.
  Added upstream's changes while keeping the glitch-soc method.

2025-06-24 22:43:43 +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 '8ba1487f30685fff4555a7537d3e6c765c73a07c' into glitch-soc/merge-upstream

2025-06-24 22:43:43 +02:00

locales

New Crowdin Translations (automated) (#35090)

2025-06-23 08:43:53 +00:00

locales-glitch

New Crowdin Translations (automated) (#3041)

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

routes

Merge commit '71d4ce1c228bab470fa9d3bcb5a130cf53665103' into glitch-soc/merge-upstream

2025-06-13 18:07:59 +02:00

templates

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

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

vite

Fix dev mode for glitch-soc

2025-06-16 21:43:30 +02:00

application.rb

Use config_for for omniauth enabled values (#35015)

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

boot.rb

…

brakeman.yml

…

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

…

formatjs-formatter.js

…

i18n-tasks.yml

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

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

mastodon.yml

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

2025-06-16 20:08:52 +02:00

navigation.rb

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

2025-03-29 17:02:39 +01: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

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