mastodon/lib
Claire c22fc2fa80 Merge commit '00c222377db0e305ac3f4a15bf1c18eb89c1f45f' into glitch-soc/merge-upstream
Conflicts:
- `.rubocop_todo.yml`:
  Took upstream's changes.
2023-06-05 13:25:22 +02:00
..
action_controller Refactor `Cache-Control` and `Vary` definitions (#24347) 2023-04-19 16:07:29 +02:00
active_record
assets
chewy/strategy
devise
generators/post_deployment_migration
json_ld
mastodon Merge commit '00c222377db0e305ac3f4a15bf1c18eb89c1f45f' into glitch-soc/merge-upstream 2023-06-05 13:25:22 +02:00
paperclip Merge commit 'f877aa9d70d0d600961989b8e97c0e0ce3ac1db6' into glitch-soc/merge-upstream 2023-05-08 19:28:21 +02:00
rails
redis
sanitize_ext Fix rubocop issues in glitch-soc-specific code 2023-05-08 19:28:43 +02:00
simple_navigation
tasks Merge branch 'main' into glitch-soc/merge-upstream 2023-05-28 17:01:25 +02:00
templates/haml/scaffold
terrapin Autofix Rubocop Style/HashSyntax (#23754) 2023-05-04 05:54:26 +02:00
webpacker
exceptions.rb
public_file_server_middleware.rb