ab152ebed4
Conflicts: - `app/models/status.rb`: Upstream refactored `visibility` handling to a concern, while glitch-soc had custom code adjacent to some of the changed lines. Applied upstream's changes. - `lib/mastodon/version.rb`: Upstream moved some definitions to `config/mastodon.yml`, while glitch-soc's default github repository had been modified. Applied upstream's changes and updated `config/mastodon.yml` accordingly. |
||
|---|---|---|
| .. | ||
| 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 | ||