Thibaut Girka 249991c498 Merge branch 'master' into glitch-soc/merge-upstream ... 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		2019-07-19 18:26:49 +02:00
..
admin
concerns	Merge branch 'master' into glitch-soc/merge-upstream	2019-07-19 18:26:49 +02:00
form
web
account_conversation_spec.rb
account_domain_block_spec.rb
account_filter_spec.rb
account_moderation_note_spec.rb
account_spec.rb	Add ActivityPub actor representing the entire server (#11321)	2019-07-19 01:44:42 +02:00
account_stat_spec.rb
account_tag_stat_spec.rb
backup_spec.rb
block_spec.rb
conversation_mute_spec.rb
conversation_spec.rb
custom_emoji_category_spec.rb	Add categories for custom emojis (#11196)	2019-06-28 15:54:10 +02:00
custom_emoji_filter_spec.rb
custom_emoji_spec.rb
custom_filter_spec.rb
domain_block_spec.rb	Change domain blocks to automatically support subdomains (#11138)	2019-06-22 00:13:10 +02:00
email_domain_block_spec.rb
export_spec.rb
favourite_spec.rb
featured_tag_spec.rb
follow_request_spec.rb
follow_spec.rb
home_feed_spec.rb
identity_spec.rb
import_spec.rb
invite_spec.rb
list_account_spec.rb
list_spec.rb
media_attachment_spec.rb
mention_spec.rb
mute_spec.rb
notification_spec.rb
poll_spec.rb
poll_vote_spec.rb
preview_card_spec.rb
relay_spec.rb
remote_follow_spec.rb
report_filter_spec.rb
report_spec.rb
scheduled_status_spec.rb
session_activation_spec.rb
setting_spec.rb
site_upload_spec.rb
status_pin_spec.rb
status_spec.rb	Remove deprecated REST API GET /api/v1/timelines/direct (#11212)	2019-07-05 02:14:56 +02:00
status_stat_spec.rb
subscription_spec.rb
tag_spec.rb	Fix only one middle dot being recognized in hashtags (#11345)	2019-07-18 03:02:56 +02:00
user_invite_request_spec.rb
user_spec.rb