Thibaut Girka 74c5b2bd08 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - Gemfile - app/controllers/api/v1/search_controller.rb Conflict because we changed the number of default results to be configurable - app/lib/settings/scoped_settings.rb Addition of a new “noindex” site-wide setting, conflict due to our change of the two other site-wide settings (default flavour and skin instead of theme) - spec/controllers/application_controller_spec.rb Addition of a new “noindex” site-wide setting, conflict due to our change of the two other site-wide settings (default flavour and skin instead of theme)		2019-09-13 18:13:43 +02:00
..
admin
account_serializer.rb
application_serializer.rb
context_serializer.rb
conversation_serializer.rb	Add unread indicator to conversations (#9009)	2018-10-19 01:47:29 +02:00
credential_account_serializer.rb
custom_emoji_serializer.rb
featured_tag_serializer.rb	Add featured tags API (#11778)	2019-09-09 10:50:33 +02:00
filter_serializer.rb	Fix filter ID not being a string in REST API (#9303)	2018-11-19 10:37:57 +01:00
identity_proof_serializer.rb
instance_serializer.rb
list_serializer.rb
marker_serializer.rb
media_attachment_serializer.rb
mute_serializer.rb
notification_serializer.rb
poll_serializer.rb
preferences_serializer.rb
preview_card_serializer.rb
relationship_serializer.rb
report_serializer.rb	Change IDs to strings rather than numbers in API JSON output (#5019)	2017-09-20 14:53:48 +02:00
scheduled_status_serializer.rb
search_serializer.rb	Remove deprecated GET /api/v1/search API (#11823)	2019-09-13 16:11:13 +02:00
status_serializer.rb
tag_serializer.rb
web_push_subscription_serializer.rb