mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-11-19 21:33:21 +00:00
4ed09276d5
Conflicts: - `.prettierignore`: Upstream added a line at the end of the file, while glitch-soc had its own extra lines. Took upstream's change. - `CONTRIBUTING.md`: We have our custom CONTRIBUTING.md quoting upstream. Upstream made changes. Ported upstream changes. - `app/controllers/application_controller.rb`: Upstream made code style changes in a method that is entirely replaced in glitch-soc. Ignored the change. - `app/models/account.rb`: Code style changes textually close to glitch-soc-specific changes. Ported upstream changes. - `lib/sanitize_ext/sanitize_config.rb`: Upstream code style changes. Ignored them. |
||
|---|---|---|
| .. | ||
| admin | ||
| keys | ||
| trends | ||
| v1 | ||
| account_serializer.rb | ||
| announcement_serializer.rb | ||
| application_serializer.rb | ||
| context_serializer.rb | ||
| conversation_serializer.rb | ||
| credential_account_serializer.rb | ||
| custom_emoji_serializer.rb | ||
| domain_block_serializer.rb | ||
| encrypted_message_serializer.rb | ||
| extended_description_serializer.rb | ||
| familiar_followers_serializer.rb | ||
| featured_tag_serializer.rb | ||
| filter_keyword_serializer.rb | ||
| filter_result_serializer.rb | ||
| filter_serializer.rb | ||
| filter_status_serializer.rb | ||
| instance_serializer.rb | ||
| list_serializer.rb | ||
| marker_serializer.rb | ||
| media_attachment_serializer.rb | ||
| mute_serializer.rb | ||
| muted_account_serializer.rb | ||
| notification_serializer.rb | ||
| poll_serializer.rb | ||
| preferences_serializer.rb | ||
| preview_card_serializer.rb | ||
| privacy_policy_serializer.rb | ||
| reaction_serializer.rb | ||
| relationship_serializer.rb | ||
| report_serializer.rb | ||
| role_serializer.rb | ||
| rule_serializer.rb | ||
| scheduled_status_serializer.rb | ||
| search_serializer.rb | ||
| status_edit_serializer.rb | ||
| status_serializer.rb | ||
| status_source_serializer.rb | ||
| suggestion_serializer.rb | ||
| tag_serializer.rb | ||
| translation_serializer.rb | ||
| web_push_subscription_serializer.rb | ||