Glitch-Shrike/lib/mastodon
Claire 395b9011ee Merge commit 'd5f02adad716520b6b9014553bc730dcef5b2f50' into glitch-soc/merge-upstream
Conflicts:
- `app/helpers/application_helper.rb`:
  Not a real conflict, just upstream adding a method textually adjacent to
  glitch-soc only code.
  Ported upstream's change.
2024-06-17 18:30:28 +02:00
..
cli Restore `verbose` option to media remove cli (#30536) 2024-06-07 12:39:53 +00:00
migration_helpers.rb
migration_warning.rb
rack_middleware.rb
redis_config.rb Add option to use native Ruby driver for Redis (#30717) 2024-06-17 12:28:01 +00:00
sidekiq_middleware.rb Fix leaking Elasticsearch connections in Sidekiq processes (#30450) 2024-05-29 08:15:06 +00:00
snowflake.rb
version.rb Merge commit '7f808ff6e9148f1cfe1e16d000e2405b6e31f243' into glitch-soc/merge-upstream 2024-05-30 15:41:31 +02:00