Thibaut Girka 34b8346e7f Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
- app/controllers/statuses_controller.rb
- app/controllers/stream_entries_controller.rb

2019-06-07 17:00:36 +02:00

..

activitypub

Do not misattribute inlined boosts if attributedTo isn't present (#10967)

2019-06-04 23:24:31 +02:00

ostatus

rubocop issues - Cleaning up (#8912)

2018-10-08 04:50:11 +02:00

proof_provider/keybase

Fix Keybase verification using wrong domain for remote accounts (#10547)

2019-04-10 20:28:43 +02:00

settings

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

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

delivery_failure_tracker_spec.rb

…

extractor_spec.rb

…

feed_manager_spec.rb

Merge branch 'master' into glitch-soc/merge-upstream

2019-05-15 17:11:40 +02: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

Record account suspend/silence time and keep track of domain blocks (#10660)

2019-05-14 19:05:02 +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

…