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 1d6152f440 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - config/locales/en.yml Conflict caused by the glitch-soc-specific “flavour” string being too close to the newly introduced “identity_proofs” string. Just included both.		6 years ago
..
activitypub	Set and store report URIs (#10303)	6 years ago
ostatus	rubocop issues - Cleaning up (#8912)	6 years ago
proof_provider/keybase	Add Keybase integration (#10297)	6 years ago
settings	…
delivery_failure_tracker_spec.rb	…
extractor_spec.rb	…
feed_manager_spec.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
formatter_spec.rb	Fix URL linkifier grabbing full-width spaces and quotations (#9997)	6 years ago
hash_object_spec.rb	…
language_detector_spec.rb	Fix language detection of non-latin alphabets even at few characters (#10276)	6 years ago
request_spec.rb	Fix connect timeout not being enforced (#9329)	6 years ago
status_filter_spec.rb	…
status_finder_spec.rb	…
tag_manager_spec.rb	…
user_settings_decorator_spec.rb	…
webfinger_resource_spec.rb	…