mirror of
https://github.com/mastodon/mastodon.git
synced 2024-12-14 23:24:55 +01:00
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 |
||
---|---|---|
.. | ||
accounts | ||
admin | ||
apps | ||
instances | ||
lists | ||
polls | ||
push | ||
statuses | ||
timelines | ||
accounts_controller_spec.rb | ||
apps_controller_spec.rb | ||
blocks_controller_spec.rb | ||
bookmarks_controller_spec.rb | ||
conversations_controller_spec.rb | ||
custom_emojis_controller_spec.rb | ||
domain_blocks_controller_spec.rb | ||
endorsements_controller_spec.rb | ||
favourites_controller_spec.rb | ||
filters_controller_spec.rb | ||
follow_requests_controller_spec.rb | ||
instances_controller_spec.rb | ||
lists_controller_spec.rb | ||
media_controller_spec.rb | ||
mutes_controller_spec.rb | ||
notifications_controller_spec.rb | ||
polls_controller_spec.rb | ||
reports_controller_spec.rb | ||
search_controller_spec.rb | ||
statuses_controller_spec.rb | ||
streaming_controller_spec.rb | ||
suggestions_controller_spec.rb |