Thibaut Girka 369a475a70 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/serializers/rest/instance_serializer.rb - app/views/layouts/error.html.haml - public/oops.png Took our version (same as upstream but without the things that only make sense in an animation). Additional changes: - app/javascript/flavours/vanilla/theme.yml Include upstream's javascript in error pages.		2019-02-17 12:26:55 +01:00
..
activitypub	Add logging for rejected ActivityPub payloads and add tests (#10062)	2019-02-17 03:38:25 +01:00
ostatus	Create Redisable#redis (#9633)	2019-02-02 19:11:38 +01:00
settings	Merge branch 'master' into glitch-soc/merge-upstream	2018-11-27 13:23:02 +01:00
activity_tracker.rb	Create Redisable#redis (#9633)	2019-02-02 19:11:38 +01:00
application_extension.rb
delivery_failure_tracker.rb	After 7 days of repeated delivery failures, give up on inbox (#5131)	2017-09-29 03:16:20 +02:00
entity_cache.rb	Remove intermediary arrays when creating hash maps from results (#9291)	2018-11-16 15:02:18 +01:00
exceptions.rb	Detect and prevent image bombs, max. processable dimension 4096^2 (#7229)	2018-04-23 09:16:38 +02:00
extractor.rb	Using double splat operator (#5859)	2017-12-06 11:41:57 +01:00
fast_geometry_parser.rb	Fix avatar and header issues by using custom geometry detector (#6515)	2018-02-21 03:40:12 +01:00
feed_manager.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-02-10 21:10:09 +01:00
formatter.rb	Fix URL linkifier grabbing full-width spaces and quotations (#9997)	2019-02-09 20:13:11 +01:00
hash_object.rb
inline_renderer.rb	Add conversations API (#8832)	2018-10-07 23:44:58 +02:00
language_detector.rb	Leave unknown language as nil if account is remote (#8861)	2018-10-05 19:17:46 +02:00
potential_friendship_tracker.rb	Create Redisable#redis (#9633)	2019-02-02 19:11:38 +01:00
request.rb	Fix ThreadResolveWorker getting queued with invalid URLs (#9628)	2018-12-26 19:15:53 +01:00
rss_builder.rb	Add RSS feeds for end-users (#7259)	2018-04-25 02:10:02 +02:00
sanitize_config.rb	Whitelist dat/ipfs/gopher links in sanitizer (#8034)	2018-07-16 22:17:43 +09:00
sidekiq_error_handler.rb	Raise Mastodon::HostValidationError when host for HTTP request is private (#6410)	2018-02-24 19:16:11 +01:00
status_filter.rb	Fix n+1 queries in StatusThreadingConcern (#7321)	2018-05-03 10:41:58 +02:00
status_finder.rb
tag_manager.rb
themes.rb	Allow selecting both default flavour and theme	2018-10-12 19:06:35 +02:00
user_settings_decorator.rb	Make displaying application used to toot opt-in (#9897)	2019-02-02 19:18:15 +01:00
webfinger_resource.rb