Thibaut Girka 12c8ac9e14 Merge branch 'master' into glitch-soc/merge-upstream ... 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.		2020-06-09 10:39:20 +02:00
..
admin
keys	Add E2EE API (#13820)	2020-06-02 19:24:53 +02:00
account_serializer.rb	Merge branch 'master' into glitch-soc/merge-upstream	2020-01-27 15:46:50 +01:00
announcement_serializer.rb	Add support for links to statuses in announcements to be opened in web UI (#13212)	2020-03-08 16:10:48 +01:00
application_serializer.rb
context_serializer.rb
conversation_serializer.rb
credential_account_serializer.rb
custom_emoji_serializer.rb
encrypted_message_serializer.rb	Fix wrong route helper in encrypted messages controller (#13952)	2020-06-03 20:32:15 +02:00
featured_tag_serializer.rb
filter_serializer.rb
identity_proof_serializer.rb
instance_serializer.rb	Merge branch 'master' into glitch-soc/merge-upstream	2020-05-03 21:23:49 +02:00
list_serializer.rb
marker_serializer.rb
media_attachment_serializer.rb	Change local media attachments to perform heavy processing asynchronously (#13210)	2020-03-08 23:56:18 +01:00
mute_serializer.rb
notification_serializer.rb
poll_serializer.rb
preferences_serializer.rb
preview_card_serializer.rb	Add blurhash to preview cards (#13984)	2020-06-05 23:10:41 +02:00
reaction_serializer.rb	Add announcements (#12662)	2020-01-23 22:00:13 +01:00
relationship_serializer.rb
report_serializer.rb
scheduled_status_serializer.rb
search_serializer.rb
status_serializer.rb	Merge branch 'master' into glitch-soc/merge-upstream	2020-02-06 21:36:38 +01:00
tag_serializer.rb
web_push_subscription_serializer.rb