a5127d0ef8
Conflicts: - `config/routes/api.rb`: glitch-soc has an extra `:destroy` action on notifications for historical reasons. Kept it for now, while otherwise updating as upstream did. |
||
---|---|---|
.. | ||
active_record | ||
assets | ||
chewy | ||
devise/strategies | ||
generators/post_deployment_migration | ||
linter | ||
mastodon | ||
paperclip | ||
rails | ||
redis | ||
sanitize_ext | ||
simple_navigation | ||
tasks | ||
templates/haml/scaffold | ||
terrapin | ||
webpacker | ||
exceptions.rb | ||
http_extensions.rb | ||
premailer_webpack_strategy.rb | ||
public_file_server_middleware.rb |