Claire 6e56f95285 Merge commit '4a7395d989e40c3bd4ef18173aa5ea850c8ddcdd' into glitch-soc/merge-upstream ...

Conflicts:
- `README.md`:
  Upstream modified its README, we have a completely different one.
  Kept our README file.

2023-12-21 18:17:17 +01:00

..

environments

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

2023-12-20 22:16:50 +01:00

imagemagick

Fix AVIF attachments (#26264)

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

initializers

Fix lint issue in glitch-soc-only file

2023-12-20 22:25:23 +01:00

locales

New Crowdin Translations (automated) (#28334)

2023-12-12 11:45:10 +00:00

locales-glitch

Fix i18n unused check being tripped by no in YAML files (#2496)

2023-12-03 11:21:34 +01:00

routes

Merge commit '7840c6b75b61e64d89d7fd9f291277fb177e513f' into glitch-soc/merge-upstream

2023-12-18 18:40:58 +01:00

webpack

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

2023-12-18 20:47:27 +01:00

application.rb

Replace Sprockets with Propshaft (#28239)

2023-12-06 10:19:24 +00:00

boot.rb

Enable Rubocop Style/FrozenStringLiteralComment (#23793)

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

brakeman.yml

Configure brakeman to ignore url safe preview card urls (#25883)

2023-10-20 15:32:16 +02:00

database.yml

Using Sidekiq concurrency for default db pool value (#26488)

2023-11-08 13:15:43 +00:00

deploy.rb

Fix Lint/SymbolConversion cop (#28175)

2023-12-01 15:53:35 +00:00

environment.rb

Enable Rubocop Style/FrozenStringLiteralComment (#23793)

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

formatjs-formatter.js

…

i18n-tasks.yml

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

2023-12-20 22:16:50 +01:00

navigation.rb

Merge commit '379115e601361c2b5da775fbf28b7dff9dc02e71' into glitch-soc/merge-upstream

2023-10-24 19:31:14 +02:00

pghero.yml

…

puma.rb

Enable Rubocop Style/FrozenStringLiteralComment (#23793)

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

roles.yml

…

routes.rb

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

2023-12-19 20:17:23 +01:00

secrets.yml

…

settings.yml

…

sidekiq.yml

Add SELF_DESTRUCT env variable to process self-destructions in the background (#26439)

2023-10-23 15:46:21 +00:00

storage.yml

…

webpacker.yml

Merge commit '4ad1c5aa7174e5cef4ba9608a44429916a119bee' into glitch-soc/merge-upstream

2023-09-02 13:31:15 +02:00