mirror of
https://github.com/glitch-soc/mastodon.git
synced 2024-11-27 18:40:12 -05:00
fe5f6bc7ed
Conflicts: - `.github/workflows/build-image.yml`: Fix erroneous deletion in a previous merge. - `Gemfile`: Conflict caused by glitch-soc-only hCaptcha dependency - `app/controllers/auth/sessions_controller.rb`: Minor conflict due to glitch-soc's theming system. - `app/controllers/filters_controller.rb`: Minor conflict due to glitch-soc's theming system. - `app/serializers/rest/status_serializer.rb`: Minor conflict due to glitch-soc having an extra `local_only` property |
||
|---|---|---|
| .. | ||
| active_record | ||
| assets | ||
| chewy/strategy | ||
| devise | ||
| generators | ||
| json_ld | ||
| mastodon | ||
| paperclip | ||
| rails | ||
| redis | ||
| sanitize_ext | ||
| tasks | ||
| templates | ||
| terrapin | ||
| webpacker | ||
| cli.rb | ||
| enumerable.rb | ||
| exceptions.rb | ||