Thibaut Girka 9adeaf2bfc Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/statuses_controller.rb`: Minor conflict due to theming system		2020-01-24 14:37:06 +01:00
..
activitypub	Clarify keyword arguments with ** (#12769)	2020-01-11 05:57:05 +09:00
connection_pool
nodeinfo	Add a nodeinfo endpoint (#12002)	2019-09-29 21:31:51 +02:00
ostatus
proof_provider
settings
activity_tracker.rb	Add a nodeinfo endpoint (#12002)	2019-09-29 21:31:51 +02:00
application_extension.rb
delivery_failure_tracker.rb
entity_cache.rb	Add announcements (#12662)	2020-01-23 22:00:13 +01:00
exceptions.rb
extractor.rb
fast_geometry_parser.rb
feed_manager.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-11-20 15:36:09 +01:00
formatter.rb	Merge branch 'master' into glitch-soc/merge-upstream	2020-01-24 14:37:06 +01:00
hash_object.rb
inline_renderer.rb	Add announcements (#12662)	2020-01-23 22:00:13 +01:00
language_detector.rb	Update ESLint and RuboCop in Code Climate (#12534)	2019-12-02 18:25:43 +01:00
potential_friendship_tracker.rb
proof_provider.rb
request.rb	Fix Ruby 2.7 support (#12831)	2020-01-12 15:49:30 +01:00
request_pool.rb
rss_builder.rb
sanitize_config.rb	Merge branch 'master' into glitch-soc/merge-upstream	2020-01-24 14:37:06 +01:00
search_query_parser.rb
search_query_transformer.rb	Fix error when searching for empty phrase (#12711)	2019-12-30 18:30:24 +01:00
sidekiq_error_handler.rb
spam_check.rb	Exempt staff members from spam check (#12874)	2020-01-17 07:50:30 +01:00
status_filter.rb
status_finder.rb
tag_manager.rb
themes.rb
toc_generator.rb	Add fallback section ID with ToC (#11941)	2019-09-23 17:25:10 +02:00
user_settings_decorator.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-10-27 12:14:01 +01:00
webfinger_resource.rb