Claire 5cade30257 Merge commit '8c579c5b34b94a9ca59f91d24ec23366f4d21137' into glitch-soc/merge-upstream ...

Conflicts:
- `jest.config.js`
- `package.json`
- `tsconfig.json`

2025-05-08 15:47:40 +02:00

..

environments

…

imagemagick

…

initializers

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

2025-05-05 20:31:48 +02:00

locales

New Crowdin Translations (automated) (#34596)

2025-05-05 08:23:27 +00:00

locales-glitch

New Crowdin Translations (automated) (#2970)

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

routes

Merge commit '715cbee93d419e26cf952bf7fc70f9c1cc217d8b' into glitch-soc/merge-upstream

2025-05-03 17:37:26 +02:00

templates

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

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

webpack

Merge commit '24c25ec4f503eb1b27b4e417d15ea62b5b9ee9fb' into glitch-soc/merge-upstream

2025-05-03 18:03:42 +02:00

application.rb

Basic FASP support (#34031)

2025-03-28 12:16:40 +00:00

boot.rb

…

brakeman.yml

…

captcha.yml

…

database.yml

…

environment.rb

…

formatjs-formatter.js

…

i18n-tasks.yml

…

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

…

roles.yml

…

routes.rb

Adds featured tab to web (#34405)

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

settings.yml

…

sidekiq.yml

…

translation.yml

…

vite.json

Migrate from Jest to Vitest (#34454)

2025-05-07 18:29:02 +00:00

webpacker.yml

…