mastodon/lib
Claire b9aa228c54 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `.github/workflows/build-image.yml`:
  Upstream attempted something with tags.
  Kept our version.
2023-07-07 19:59:43 +02:00
..
action_controller Refactor Cache-Control and Vary definitions (#24347) 2023-04-19 16:07:29 +02:00
active_record
assets
chewy/strategy Change root Chewy strategy to emit a warning instead of erroring out in production mode (#24327) 2023-04-03 15:05:39 +02:00
devise
generators/post_deployment_migration Clean up the post deployment migration generator (#24233) 2023-04-11 11:25:29 +02:00
json_ld
linter Consistently use middle dot (·) instead of bullet (•) to separate items (#25248) 2023-06-02 19:58:18 +02:00
mastodon Merge branch 'main' into glitch-soc/merge-upstream 2023-07-07 19:59:43 +02:00
paperclip Merge branch 'main' into glitch-soc/merge-upstream 2023-07-06 15:16:34 +02:00
rails
redis
sanitize_ext Merge branch 'main' into glitch-soc/merge-upstream 2023-07-06 15:16:34 +02:00
simple_navigation
tasks Merge branch 'main' into glitch-soc/merge-upstream 2023-07-07 19:59:43 +02:00
templates/haml/scaffold Clean up the post deployment migration generator (#24233) 2023-04-11 11:25:29 +02:00
terrapin Autofix Rubocop Style/HashSyntax (#23754) 2023-05-04 05:54:26 +02:00
webpacker
exceptions.rb
public_file_server_middleware.rb Add hardened headers to user-uploaded files (#25756) 2023-07-06 14:31:37 +02:00