Thibaut Girka 02062aab55 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/about_controller.rb - app/controllers/tags_controller.rb - app/views/about/show.html.haml - spec/views/about/show.html.haml_spec.rb		2019-03-13 15:16:02 +01:00
..
activitypub	Fix poll update handler calling method was that was not available (#10246)	2019-03-12 22:58:59 +01:00
ostatus	When serializing polls over OStatus, serialize poll options to text (#10160)	2019-03-05 21:09:18 +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
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	2019-02-10 21:10:09 +01:00
formatter.rb	Fix newlines in OStatus and RSS serializations (#10183)	2019-03-05 23:58:58 +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	Increase DNS timeouts (#10238)	2019-03-11 13:27:57 +01:00
rss_builder.rb
sanitize_config.rb
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	Make displaying application used to toot opt-in (#9897)	2019-02-02 19:18:15 +01:00
webfinger_resource.rb