chuckya/lib/mastodon
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
..
cli Minor phrasing on tootcli statuses remove (#30122) 2024-04-30 08:51:39 +00:00
migration_helpers.rb Use unchanging github links in docs/comments (#29545) 2024-03-11 15:14:55 +00:00
migration_warning.rb Migration warning helper, and only run in production env (#24253) 2023-03-26 00:39:24 +01:00
rack_middleware.rb Fix opening and closing Redis connections instead of using a pool (#18171) 2022-04-29 22:43:07 +02:00
redis_config.rb Enable Rails 7.1 Marshalling format (#28609) 2024-01-05 21:57:47 +00:00
sidekiq_middleware.rb Do not truncate backtrace when the BACKTRACE env variable is set (#26794) 2023-09-06 09:18:10 +02:00
snowflake.rb Fix Style/SelfAssignment cop (#28171) 2023-12-01 15:52:52 +00:00
version.rb Bump version to v4.3.0-alpha.3 (#29241) 2024-02-16 12:17:15 +01:00