Glitch-Shrike/lib/mastodon
Claire 2810231180 Merge commit 'b2388be71eb0031ef9e47c492b1c038231cd8bc0' into glitch-soc/merge-upstream
Conflicts:
- `app/controllers/activitypub/collections_controller.rb`:
  Upstream renamed a helper method everywhere.
  There was one glitch-soc line involving changes because of the local-only post
  feature.
  Ported upstream's change.
2024-05-16 19:30:10 +02:00
..
cli Fix off-by-one in `tootctl media` commands (#30306) 2024-05-15 13:11:13 +00:00
migration_helpers.rb Use unchanging github links in docs/comments (#29545) 2024-03-11 15:14:55 +00:00
migration_warning.rb
rack_middleware.rb
redis_config.rb Enable Rails 7.1 Marshalling format (#28609) 2024-01-05 21:57:47 +00:00
sidekiq_middleware.rb
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