Thibaut Girka 1488be7d96 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/home_controller.rb - app/controllers/shares_controller.rb - app/javascript/packs/public.js - app/models/status.rb - app/serializers/initial_state_serializer.rb - app/views/home/index.html.haml - app/views/layouts/public.html.haml - app/views/public_timelines/show.html.haml - app/views/shares/show.html.haml - app/views/tags/show.html.haml - config/initializers/content_security_policy.rb - config/locales/en.yml - config/webpack/shared.js - package.json		2019-08-19 21:49:35 +02:00
..
activitypub
connection_pool
ostatus
proof_provider
settings
activity_tracker.rb
application_extension.rb
delivery_failure_tracker.rb
entity_cache.rb
exceptions.rb
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-08-05 13:13:28 +02:00
formatter.rb
hash_object.rb
inline_renderer.rb
language_detector.rb
potential_friendship_tracker.rb
proof_provider.rb
request.rb
request_pool.rb	Add request pool to improve delivery performance (#10353)	2019-07-02 00:34:38 +02:00
rss_builder.rb	Add RSS feeds for end-users (#7259)	2018-04-25 02:10:02 +02:00
sanitize_config.rb
search_query_parser.rb
search_query_transformer.rb	Fix accounts search by full/partial display name and others (#11580)	2019-08-16 13:00:30 +02:00
sidekiq_error_handler.rb
spam_check.rb
status_filter.rb	Fix n+1 queries in StatusThreadingConcern (#7321)	2018-05-03 10:41:58 +02:00
status_finder.rb	Remove Atom feeds and old URLs in the form of GET /:username/updates/:id (#11247)	2019-07-07 16:16:51 +02:00
tag_manager.rb
themes.rb
user_settings_decorator.rb	Add option to disable emoji replacements	2019-08-12 23:01:37 +02:00
webfinger_resource.rb