mastodon/lib
Claire 3d25fe0426 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `.github/workflows/build-image.yml`:
  Upstream changed the workflow a bit.
  Conflict comes from us pushing to ghcr while upstream pushes to dockerhub.
  Ported the upstream changes while still pushing to ghcr.
2022-02-23 18:13:12 +01:00
..
action_dispatch replace all instances of "ends_with?" with "end_with?" (#15745) 2021-02-19 09:56:14 +01:00
active_record
assets
chewy/strategy
devise Fix authentication before 2FA challenge (#11943) 2019-09-24 04:35:36 +02:00
generators Add post-deployment migration system (#8182) 2018-08-13 18:17:20 +02:00
json_ld
mastodon Merge branch 'main' into glitch-soc/merge-upstream 2022-02-23 18:13:12 +01:00
paperclip Fix some media attachments being converted with too high framerates (#17619) 2022-02-22 17:11:22 +01:00
rails
redis
sanitize_ext
tasks Merge branch 'main' into glitch-soc/merge-upstream 2022-02-08 18:23:53 +01:00
templates
terrapin
webpacker
cli.rb Add ability for admins to delete canonical email blocks (#16644) 2021-12-17 23:02:14 +01:00
enumerable.rb
exceptions.rb
sidekiq_error_handler.rb Fix warnings on Rails boot (#16946) 2021-12-27 00:47:20 +01:00