Thibaut Girka 571d219bb9 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts manually resolved: - app/services/post_status_service.rb - config/locales/simple_form.pl.yml - config/routes.rb - config/webpack/loaders/sass.js - config/webpack/shared.js - package.json - yarn.lock		2019-01-02 15:36:53 +01:00
..
activitypub	Ensure blocked user unfollows blocker if Block/Undo Block are processed out of order (#9687)	2019-01-02 01:12:02 +01:00
ostatus	Fix ThreadResolveWorker getting queued with invalid URLs (#9628)	2018-12-26 19:15:53 +01:00
settings	Merge branch 'master' into glitch-soc/merge-upstream	2018-11-27 13:23:02 +01:00
activity_tracker.rb
application_extension.rb
delivery_failure_tracker.rb
entity_cache.rb	Remove intermediary arrays when creating hash maps from results (#9291)	2018-11-16 15:02:18 +01:00
exceptions.rb
extractor.rb
fast_geometry_parser.rb
feed_manager.rb	Merge branch 'master' into glitch-soc/merge-upstream	2018-12-09 16:08:04 +01:00
formatter.rb	Remove intermediary arrays when creating hash maps from results (#9291)	2018-11-16 15:02:18 +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	Fix activity:interactions counter to count all interactions (#8037)	2018-07-16 18:35:43 +02:00
request.rb	Fix ThreadResolveWorker getting queued with invalid URLs (#9628)	2018-12-26 19:15:53 +01:00
rss_builder.rb
sanitize_config.rb	Whitelist dat/ipfs/gopher links in sanitizer (#8034)	2018-07-16 22:17:43 +09:00
sidekiq_error_handler.rb
status_filter.rb
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	Add a per-user setting to hide followers count	2018-12-20 14:51:12 +01:00
webfinger_resource.rb