Thibaut Girka 68629f2773 Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
- app/controllers/statuses_controller.rb
  minor conflict because of glitch-soc's theming system
- app/controllers/stream_entries_controller.rb
  minor conflict because of glitch-soc's theming system

2019-05-10 17:09:12 +02:00

..

activitypub

Prevent silenced local users from notifying remote users not following them (#10575)

2019-05-09 22:05:43 +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

…

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

…

user_settings_decorator_spec.rb

…

webfinger_resource_spec.rb

…