Thibaut Girka ab5ff638f2 Merge branch 'master' into glitch-soc/master ... Conflicts: - `config/locales/en.yml` No real conflict, upstream added a translatable string “too close” to one specific to glitch-soc - `lib/mastodon/statuses_cli.rb` Fixes made upstream, while changed in glitch-soc to keep bookmarked statuses - `package.json` No real conflict, additional dependency in glitch-soc		2019-12-19 13:52:54 +01:00
..
activitypub	Clean up OStatus-related codepaths (#12173)	2019-12-17 13:32:57 +01:00
connection_pool	Add request pool to improve delivery performance (#10353)	2019-07-02 00:34:38 +02:00
nodeinfo	Add a nodeinfo endpoint (#12002)	2019-09-29 21:31:51 +02:00
ostatus	Remove Atom feeds and old URLs in the form of `GET /:username/updates/:id` (#11247)	2019-07-07 16:16:51 +02:00
proof_provider	Default to the web domain (eg. mastodon.lubar.me) instead of the local domain (eg. lubar.me) for keybase proofs (#10565)	2019-04-21 04:53:24 +02:00
settings	Merge branch 'master' into glitch-soc/merge-upstream	2019-09-13 18:13:43 +02:00
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	…
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	2019-10-27 12:14:01 +01:00
hash_object.rb	…
inline_renderer.rb	…
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	Add Keybase integration (#10297)	2019-03-18 21:00:55 +01:00
request.rb	Attempt to concurrently connect to remote IP addresses (#11757)	2019-09-05 05:32:53 +02:00
request_pool.rb	Add request pool to improve delivery performance (#10353)	2019-07-02 00:34:38 +02:00
rss_builder.rb	…
sanitize_config.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-10-27 12:14:01 +01:00
search_query_parser.rb	Fix accounts search by full/partial display name and others (#11580)	2019-08-16 13:00:30 +02:00
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	Fix statsd UDP sockets not being cleaned up in Sidekiq (#11230)	2019-07-02 01:01:17 +02:00
spam_check.rb	Fix auto-report string saying the account has been auto-silenced (#12142)	2019-10-10 18:47:24 +02:00
status_filter.rb	…
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	Refactor domain block checks (#11268)	2019-07-09 03:27:35 +02:00
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	Add ActivityPub actor representing the entire server (#11321)	2019-07-19 01:44:42 +02:00