Claire bc33be0342 Merge commit '23e32a4b3031d1da8b911e0145d61b4dd47c4f96' into glitch-soc/merge-upstream ...

Conflicts:
- `Gemfile.lock`:
  Conflict because we had updated the `json-ld` gem to fix a yanked dependency.
  Kept our version of `json-ld` while updating other dependencies.

2023-12-18 18:07:24 +01:00

..

environments

Merge commit '9a3d047f3e604e581e18346424569e28fc9c5b96' into glitch-soc/merge-upstream

2023-10-25 19:59:17 +02:00

imagemagick

Fix AVIF attachments (#26264)

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

initializers

Merge commit '23e32a4b3031d1da8b911e0145d61b4dd47c4f96' into glitch-soc/merge-upstream

2023-12-18 18:07:24 +01:00

locales

New Crowdin Translations (automated) (#27687)

2023-11-07 09:03:59 +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 'b90383d07388fe8513e59a6deb1a2391146c6561' into glitch-soc/merge-upstream

2023-09-15 21:39:21 +02:00

webpack

Merge commit '3bf896c973404261f4f7b25c25ea22adb1a85e7d' into glitch-soc/main

2023-12-17 17:43:30 +01:00

application.rb

Move i18n locale configuration to separate initializer (#27571)

2023-11-07 15:22:14 +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

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 '2e6bf60f1549e5c1f1cfea2d614f978bea17b8a2' into glitch-soc/merge-upstream

2023-12-10 18:05:02 +01:00

navigation.rb

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

2023-10-24 19:31:14 +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 '23e32a4b3031d1da8b911e0145d61b4dd47c4f96' into glitch-soc/merge-upstream

2023-12-18 18:07:24 +01:00

secrets.yml

…

settings.yml

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

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

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

Update Mastodon to Rails 6.1 (#15910)

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

webpacker.yml

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

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