Claire f09f5b35f2 Merge commit 'd97d31cce664281d868e4c661451687a301c97c8' into glitch-soc/merge-upstream ...

Conflicts:
- `app/models/account.rb`:
  Upstream refactored this file a bit, moving validation limits to constants.
  We already had a similar change, although with different constant names.
  Updated to match upstream's code.

The following files were also modified accordingly:
- `app/views/settings/profiles/show.html.haml`
- `spec/requests/api/v1/accounts/credentials_spec.rb`

2024-05-04 16:12:51 +02:00

..

environments

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

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

imagemagick

Fix AVIF attachments (#26264)

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

initializers

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

2024-05-04 14:59:00 +02:00

locales

New Crowdin Translations (automated) (#30128)

2024-04-30 09:05:53 +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

Use implicit dotenv load (#30121)

2024-04-30 13:00:39 +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

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

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

secrets.yml

…

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 '3f6887557b23d363e7f8f18518db4447739d64bb' into glitch-soc/merge-upstream

2024-05-04 14:59:00 +02:00