Thibaut Girka aae60a2366 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/concerns/sign_in_token_authentication_concern.rb`: Conflict due to glitch-soc's theming system. Ported upstream changes. - `app/controllers/concerns/two_factor_authentication_concern.rb`: Conflict due to glitch-soc's theming system. Ported upstream changes.		2020-06-24 15:33:41 +02:00
..
activitypub	Add E2EE API (#13820)	2020-06-02 19:24:53 +02:00
connection_pool
nodeinfo
ostatus
proof_provider
rss	Improve RSS entries for statuses (#13592)	2020-05-10 09:50:54 +02:00
settings	Merge branch 'master' into glitch-soc/merge-upstream	2019-09-13 18:13:43 +02:00
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
feed_manager.rb
formatter.rb
hash_object.rb
inline_renderer.rb
language_detector.rb
potential_friendship_tracker.rb
proof_provider.rb	Add Keybase integration (#10297)	2019-03-18 21:00:55 +01:00
rate_limiter.rb
request.rb
request_pool.rb
rss_builder.rb
sanitize_config.rb
search_query_parser.rb
search_query_transformer.rb
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
tag_manager.rb
themes.rb
toc_generator.rb
user_settings_decorator.rb
webfinger_resource.rb