nyastodon/lib/mastodon
Claire 75580360cd Merge commit '272592d16d40e804ec325ef3b5e6de9bbad5f2dd' into glitch-soc/merge-upstream
Conflicts:
- `.rubocop_todo.yml`:
  Upstream fixed a bunch lint issues, and changed the `Max` parameter of the
  `Metrics/AbcSize` cop.
  Glitch-soc has different code and slightly higher `AbcSize` complexity,
  modified the `.rubocop_todo.yml` file accordingly.
- `app/policies/status_policy.rb`:
  Upstream changed `account.suspended?` to `account.unavailable?` to prepare
  for delete flags. Glitch-soc has additional local-only conditions.
  Ported upstream's refactor while keeping glitch-soc's additional condition.
- `app/serializers/initial_state_serializer.rb`:
  Upstream refactored a bunch of stuff while glitch-soc has more settings.
  Refactored as upstream did while keeping glitch-soc's settings.
2023-12-20 22:05:31 +01:00
..
cli Model concerns organization into module namespaces (#28149) 2023-12-01 11:00:41 +00:00
migration_helpers.rb Capture minimum postgres version 12 (#27528) 2023-10-26 20:35:15 +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 Fix cache store pool config deprecation warnings (#27551) 2023-10-25 12:01:21 +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 account_id, max_id and min_id params not working in search (#26847) 2023-09-08 14:25:00 +02:00
version.rb Merge commit 'e6b903b21e0682c1156ffec583ac2836fda7d657' into glitch-soc/merge-upstream 2023-10-08 16:30:00 +02:00