Claire 6204d13a2e Merge commit 'ec71c02c4b028c3541742f023729aeb295a51559' into glitch-soc/merge-upstream ...

Conflicts:
- `Gemfile`:
  There was an extra newline in glitch-soc for some reason.
  Removed it.

2024-05-01 19:38:34 +02:00

..

environments

Merge commit '3205a654caf903002c2db872f802a3332201678b' into glitch-soc/merge-upstream

2024-01-26 20:47:20 +01:00

imagemagick

Fix AVIF attachments (#26264)

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

initializers

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

2024-05-01 19:38:34 +02:00

locales

New Crowdin Translations (automated) (#29994)

2024-04-19 13:57:43 +00:00

locales-glitch

New Crowdin Translations (automated) (#2668)

2024-04-06 18:18:06 +02:00

routes

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

2024-03-14 17:27:16 +01:00

templates

Move privacy policy into markdown file (#28699)

2024-01-19 11:22:23 +00:00

webpack

Replace use_pack, layouts/theme and @theme by new helpers

2024-04-28 15:45:42 +02:00

application.rb

Enable Rails 7.1 Marshalling format (#28609)

2024-01-05 21:57:47 +00:00

boot.rb

Use abort instead of warn(); exit in boot.rb env check (#29209)

2024-02-16 14:29:24 +00: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

Merge commit '44cd88adc4e2f4028dcc2b08b98368f0dc90cee4' into glitch-soc/merge-upstream

2023-06-10 12:38:33 +02:00

i18n-tasks.yml

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

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

navigation.rb

Merge commit '954b470fbce3fbe4b9b42992b03425fa24d6a2ad' into glitch-soc/merge-upstream

2024-04-06 19:35:21 +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 '954b470fbce3fbe4b9b42992b03425fa24d6a2ad' into glitch-soc/merge-upstream

2024-04-06 19:35:21 +02:00

secrets.yml

Upgrade to Rails 5.0.0.1

2016-08-17 17:58:00 +02:00

settings.yml

Merge commit '02ea16150647ac3baf0bb8a89203ccc7200b4a2f' into glitch-soc/merge-upstream

2024-05-01 14:25:47 +02:00

sidekiq.yml

Automatically switch from open to approved registrations in absence of moderators (#29318)

2024-02-22 20:45:40 +01: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