Thibaut Girka 16ff7c5627 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - Gemfile - Gemfile.lock - app/controllers/about_controller.rb - app/controllers/auth/sessions_controller.rb		2019-09-30 12:23:57 +02:00
..
activitypub	Change silences to always require approval on follow (#11975)	2019-09-27 21:13:51 +02:00
connection_pool	Add request pool to improve delivery performance (#10353)	2019-07-02 00:34:38 +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/keybase
settings
delivery_failure_tracker_spec.rb
extractor_spec.rb
feed_manager_spec.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-08-05 13:13:28 +02:00
formatter_spec.rb	Play animated custom emoji on hover (#11348)	2019-07-21 18:10:40 +02:00
hash_object_spec.rb
language_detector_spec.rb	Change language detection to include hashtags as words (#11341)	2019-07-18 03:02:15 +02:00
request_pool_spec.rb	Add request pool to improve delivery performance (#10353)	2019-07-02 00:34:38 +02:00
request_spec.rb
sanitize_config_spec.rb	Fix sanitizer text case for glitch-soc, which preserves lists	2019-07-19 19:16:07 +02:00
spam_check_spec.rb	Change spam check to apply to local accounts and add a threshold (#11806)	2019-09-18 12:53:13 +02:00
status_filter_spec.rb	Record account suspend/silence time and keep track of domain blocks (#10660)	2019-05-14 19:05:02 +02:00
status_finder_spec.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_spec.rb	Remove Atom feeds and old URLs in the form of GET /:username/updates/:id (#11247)	2019-07-07 16:16:51 +02:00
user_settings_decorator_spec.rb
webfinger_resource_spec.rb