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

Add a test for Settings::Extend#settings (#5720)

2017-11-19 04:15:32 +01:00

delivery_failure_tracker_spec.rb

After 7 days of repeated delivery failures, give up on inbox (#5131)

2017-09-29 03:16:20 +02:00

extractor_spec.rb

Spec Extractor (#3540)

2017-06-04 14:57:02 +02:00

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

Spec HashObject (#3544)

2017-06-04 14:59:52 +02:00

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

Fix regression from #3490 - filter out hidden statuses from ancestors/descendants even if the viewer is anonymous (#3752)

2017-06-15 02:00:08 +02:00

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

Enable updating additional account information from user preferences via rest api (#6789)

2018-04-08 13:43:10 +02:00

webfinger_resource_spec.rb

Fix randomly fail (regression from #3560) (#3580)

2017-06-05 10:03:36 +02:00