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

Conflicts:
- app/models/status.rb
- db/schema.rb

Both conflicts are caused by us having extra database columns.

2019-03-05 19:23:16 +01:00

..

activitypub

Add test ensuring that unknown object types are rejected (#10166)

2019-03-05 11:46:36 +09:00

ostatus

rubocop issues - Cleaning up (#8912)

2018-10-08 04:50:11 +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

Leave unknown language as nil if account is remote (#8861)

2018-10-05 19:17:46 +02: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

…