Thibaut Girka dae5e446fe Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `Gemfile`: We updated httplog in a separate commit. Took upstream's change which updated it further. - `Gemfile.lock`: We updated httplog in a separate commit. Took upstream's change which updated it further. - `app/lib/sanitize_config.rb`: Upstream added better unsupported link stripping, while we had different sanitizing configs. Took only upstream's link stripping code. - `config/locales/simple_form.pl.yml`: Strings unused in glitch-soc had been removed from glitch-soc, reintroduced them even if they are not useful, to reduce the risk of later merge conflicts.		2020-02-09 12:15:55 +01:00
..
activitypub	Fixes featured hashtag setting page erroring out instead of rejecting invalid tags (#12436)	2019-12-17 13:31:56 +01:00
connection_pool
ostatus
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	Add support for magnet: URIs (#12905)	2020-01-23 21:27:26 +01: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
request_spec.rb
sanitize_config_spec.rb	Merge branch 'master' into glitch-soc/merge-upstream	2020-02-09 12:15:55 +01:00
spam_check_spec.rb	Remove auto-silence behaviour from spam check (#12117)	2019-10-09 07:11:23 +02:00
status_filter_spec.rb
status_finder_spec.rb
tag_manager_spec.rb
user_settings_decorator_spec.rb
webfinger_resource_spec.rb