mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-12-14 17:35:17 +00:00
12c8ac9e14
Conflicts: - `app/controllers/activitypub/collections_controller.rb`: Conflict due to glitch-soc having to take care of local-only pinned toots in that controller. Took upstream's changes and restored the local-only special handling. - `app/controllers/auth/sessions_controller.rb`: Minor conflicts due to the theming system, applied upstream changes, adapted the following two files for glitch-soc's theming system: - `app/controllers/concerns/sign_in_token_authentication_concern.rb` - `app/controllers/concerns/two_factor_authentication_concern.rb` - `app/services/backup_service.rb`: Minor conflict due to glitch-soc having to handle local-only toots specially. Applied upstream changes and restored the local-only special handling. - `app/views/admin/custom_emojis/index.html.haml`: Minor conflict due to the theming system. - `package.json`: Upstream dependency updated, too close to a glitch-soc-only dependency in the file. - `yarn.lock`: Upstream dependency updated, too close to a glitch-soc-only dependency in the file. |
||
|---|---|---|
| .. | ||
| admin | ||
| concerns | ||
| form | ||
| web | ||
| account.rb | ||
| account_alias.rb | ||
| account_conversation.rb | ||
| account_domain_block.rb | ||
| account_filter.rb | ||
| account_identity_proof.rb | ||
| account_migration.rb | ||
| account_moderation_note.rb | ||
| account_pin.rb | ||
| account_stat.rb | ||
| account_tag_stat.rb | ||
| account_warning.rb | ||
| account_warning_preset.rb | ||
| admin.rb | ||
| announcement.rb | ||
| announcement_filter.rb | ||
| announcement_mute.rb | ||
| announcement_reaction.rb | ||
| application_record.rb | ||
| backup.rb | ||
| block.rb | ||
| bookmark.rb | ||
| context.rb | ||
| conversation.rb | ||
| conversation_mute.rb | ||
| custom_emoji.rb | ||
| custom_emoji_category.rb | ||
| custom_emoji_filter.rb | ||
| custom_filter.rb | ||
| device.rb | ||
| direct_feed.rb | ||
| domain_allow.rb | ||
| domain_block.rb | ||
| email_domain_block.rb | ||
| encrypted_message.rb | ||
| export.rb | ||
| favourite.rb | ||
| featured_tag.rb | ||
| feed.rb | ||
| follow.rb | ||
| follow_request.rb | ||
| home_feed.rb | ||
| identity.rb | ||
| import.rb | ||
| instance.rb | ||
| instance_filter.rb | ||
| invite.rb | ||
| invite_filter.rb | ||
| list.rb | ||
| list_account.rb | ||
| list_feed.rb | ||
| marker.rb | ||
| media_attachment.rb | ||
| mention.rb | ||
| message_franking.rb | ||
| mute.rb | ||
| notification.rb | ||
| one_time_key.rb | ||
| poll.rb | ||
| poll_vote.rb | ||
| preview_card.rb | ||
| relationship_filter.rb | ||
| relay.rb | ||
| remote_follow.rb | ||
| report.rb | ||
| report_filter.rb | ||
| report_note.rb | ||
| scheduled_status.rb | ||
| search.rb | ||
| session_activation.rb | ||
| setting.rb | ||
| site_upload.rb | ||
| status.rb | ||
| status_pin.rb | ||
| status_stat.rb | ||
| system_key.rb | ||
| tag.rb | ||
| tag_filter.rb | ||
| tombstone.rb | ||
| trending_tags.rb | ||
| unavailable_domain.rb | ||
| user.rb | ||
| user_invite_request.rb | ||
| web.rb | ||