You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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.		5 years ago
..
activitypub	Fixes featured hashtag setting page erroring out instead of rejecting invalid tags (#12436)	5 years ago
connection_pool	Add request pool to improve delivery performance (#10353)	5 years ago
ostatus	Remove Atom feeds and old URLs in the form of `GET /:username/updates/:id` (#11247)	5 years ago
proof_provider/keybase	Fix Keybase verification using wrong domain for remote accounts (#10547)	6 years ago
settings	…
delivery_failure_tracker_spec.rb	…
extractor_spec.rb	…
feed_manager_spec.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
formatter_spec.rb	Add support for magnet: URIs (#12905)	5 years ago
hash_object_spec.rb	…
language_detector_spec.rb	Change language detection to include hashtags as words (#11341)	5 years ago
request_pool_spec.rb	Add request pool to improve delivery performance (#10353)	5 years ago
request_spec.rb	…
sanitize_config_spec.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
spam_check_spec.rb	Remove auto-silence behaviour from spam check (#12117)	5 years ago
status_filter_spec.rb	Record account suspend/silence time and keep track of domain blocks (#10660)	6 years ago
status_finder_spec.rb	Remove Atom feeds and old URLs in the form of `GET /:username/updates/:id` (#11247)	5 years ago
tag_manager_spec.rb	Remove Atom feeds and old URLs in the form of `GET /:username/updates/:id` (#11247)	5 years ago
user_settings_decorator_spec.rb	…
webfinger_resource_spec.rb	…