Claire 6530f9709c Merge commit '121443c0fca383268b8022c048dd137994785aff' into glitch-soc/main ...

Conflicts:
- `.rubocop_todo.yml`:
  Upstream regenerated this file, glitch-soc had a specific ignore.

2023-08-13 18:47:15 +02:00

..

environments

Merge commit '0d7340380cf3094335d8bc67f7c465e2b154566a' into glitch-soc/merge-upstream

2023-07-13 13:35:15 +02:00

imagemagick

Fix AVIF attachments (#26264)

2023-08-01 19:34:11 +02:00

initializers

Merge commit '121443c0fca383268b8022c048dd137994785aff' into glitch-soc/main

2023-08-13 18:47:15 +02:00

locales

New Crowdin Translations (automated) (#26373)

2023-08-10 09:47:42 +02:00

locales-glitch

New Crowdin translations (#2327)

2023-07-27 19:25:29 +02:00

routes

Merge commit '3a4d3e9d4b573c400eec1743471d54cdccae50a5' into glitch-soc/merge-upstream

2023-08-12 09:36:38 +02:00

webpack

Merge commit '425d77f8124a50fc033e8fb3bdf7b89a6a25f4fa' into glitch-soc/merge-upstream

2023-08-11 22:15:41 +02:00

application.rb

Remove obsolete backport from Rails 7 (#26254)

2023-07-29 22:28:05 +02:00

boot.rb

Enable Rubocop Style/FrozenStringLiteralComment (#23793)

2023-07-12 09:47:08 +02:00

brakeman.ignore

Ignore the brakeman PermitAttributes check (#25915)

2023-07-28 23:17:53 +02:00

brakeman.yml

Ignore the brakeman PermitAttributes check (#25915)

2023-07-28 23:17:53 +02:00

database.yml

Change DB_REPLICA_* environment variables to REPLICA_DB_* (#26386)

2023-08-08 13:59:40 +02:00

deploy.rb

Fix Performance/CollectionLiteralInLoop cop (#24819)

2023-05-04 05:33:55 +02: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 'cfd50f30bb5dda4dd90e1ad01f3e62c99135c36f' into glitch-soc/merge-upstream

2023-07-30 14:33:28 +02:00

navigation.rb

Merge commit '425d77f8124a50fc033e8fb3bdf7b89a6a25f4fa' into glitch-soc/merge-upstream

2023-08-11 22:15:41 +02:00

pghero.yml

Fix PgHero Content-Security-Policy when CDN_HOST is used (#13595)

2020-05-04 13:52:41 +02:00

puma.rb

Enable Rubocop Style/FrozenStringLiteralComment (#23793)

2023-07-12 09:47:08 +02:00

roles.yml

Add customizable user roles (#18641)

2022-07-05 02:41:40 +02:00

routes.rb

Merge commit '3554c527954441fd924586a49c7d99a89101ac7e' into glitch-soc/merge-upstream

2023-07-30 16:11:55 +02:00

secrets.yml

…

settings.yml

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

2023-05-25 22:49:18 +02:00

sidekiq.yml

Change indexing frequency from 5 minutes to 1 minute, add locks to schedulers (#26304)

2023-08-03 11:04:05 +02:00

storage.yml

Update Mastodon to Rails 6.1 (#15910)

2021-03-24 10:44:31 +01:00

webpacker.yml

Merge branch 'main' into glitch-soc/merge-upstream

2023-04-03 17:40:59 +02:00