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.		2019-03-20 13:54:00 +01:00
..
activitypub	Set and store report URIs (#10303)	2019-03-17 15:34:56 +01:00
ostatus	rubocop issues - Cleaning up (#8912)	2018-10-08 04:50:11 +02:00
proof_provider/keybase	Add Keybase integration (#10297)	2019-03-18 21:00:55 +01:00
settings
delivery_failure_tracker_spec.rb
extractor_spec.rb
feed_manager_spec.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-01-10 21:00:30 +01:00
formatter_spec.rb	Fix URL linkifier grabbing full-width spaces and quotations (#9997)	2019-02-09 20:13:11 +01:00
hash_object_spec.rb
language_detector_spec.rb	Fix language detection of non-latin alphabets even at few characters (#10276)	2019-03-15 05:07:09 +01:00
request_spec.rb	Fix connect timeout not being enforced (#9329)	2018-11-22 20:12:04 +01:00
status_filter_spec.rb
status_finder_spec.rb	Add tests for embeds controller (#7719)	2018-06-04 10:35:56 +09:00
tag_manager_spec.rb	Append '.test' to hostname in stub data (#7260)	2018-04-25 14:12:28 +02:00
user_settings_decorator_spec.rb
webfinger_resource_spec.rb