This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.
mastodon/lib
Claire 1a664560cc Merge commit '6aeb162927e6f9bbfd597632a10d82d9656c2385' into glitch-soc/merge-upstream
Conflicts:
- `.github/dependabot.yml`:
  We deleted it.
  Kept it removed.
- `app/javascript/packs/public.jsx`:
  Upstream changed an import, we have slightly different ones.
  Ported upstream changes.
2023-05-09 23:12:48 +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 Clean up the post deployment migration generator (#24233) 2023-04-11 11:25:29 +02:00
json_ld
mastodon Merge commit '6aeb162927e6f9bbfd597632a10d82d9656c2385' into glitch-soc/merge-upstream 2023-05-09 23:12:48 +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 commit '0ad2413b35287958f59073a5b63aecc659a64d98' into glitch-soc/merge-upstream 2023-05-08 15:28:36 +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
cli.rb
exceptions.rb
public_file_server_middleware.rb