Conflicts: - `spec/system/settings/preferences/appearance_spec.rb`: Upstream tests for changing themes in there, but glitch-soc has its own place for that. Updated upstream's change while skipping the theme test. |
||
---|---|---|
.. | ||
action_dispatch | ||
active_record | ||
assets | ||
chewy | ||
devise/strategies | ||
elasticsearch | ||
generators/post_deployment_migration | ||
linter | ||
mastodon | ||
paperclip | ||
rails | ||
redis | ||
sanitize_ext | ||
simple_navigation | ||
stoplight | ||
tasks | ||
templates/haml/scaffold | ||
terrapin | ||
webpacker | ||
exceptions.rb | ||
premailer_bundled_asset_strategy.rb | ||
public_file_server_middleware.rb |