249991c498
Conflicts: - Gemfile.lock - app/controllers/accounts_controller.rb - app/controllers/admin/dashboard_controller.rb - app/controllers/follower_accounts_controller.rb - app/controllers/following_accounts_controller.rb - app/controllers/remote_follow_controller.rb - app/controllers/stream_entries_controller.rb - app/controllers/tags_controller.rb - app/javascript/packs/public.js - app/lib/sanitize_config.rb - app/models/account.rb - app/models/form/admin_settings.rb - app/models/media_attachment.rb - app/models/stream_entry.rb - app/models/user.rb - app/serializers/initial_state_serializer.rb - app/services/batched_remove_status_service.rb - app/services/post_status_service.rb - app/services/process_mentions_service.rb - app/services/reblog_service.rb - app/services/remove_status_service.rb - app/views/admin/settings/edit.html.haml - config/locales/simple_form.pl.yml - config/settings.yml - docker-compose.yml |
||
|---|---|---|
| .. | ||
| admin | ||
| concerns | ||
| form | ||
| web | ||
| account.rb | ||
| account_conversation.rb | ||
| account_domain_block.rb | ||
| account_filter.rb | ||
| account_identity_proof.rb | ||
| account_moderation_note.rb | ||
| account_pin.rb | ||
| account_stat.rb | ||
| account_tag_stat.rb | ||
| account_warning.rb | ||
| account_warning_preset.rb | ||
| admin.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 | ||
| direct_feed.rb | ||
| domain_block.rb | ||
| email_domain_block.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 | ||
| media_attachment.rb | ||
| mention.rb | ||
| mute.rb | ||
| notification.rb | ||
| poll.rb | ||
| poll_vote.rb | ||
| preview_card.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 | ||
| subscription.rb | ||
| tag.rb | ||
| tombstone.rb | ||
| trending_tags.rb | ||
| user.rb | ||
| user_invite_request.rb | ||
| web.rb | ||