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

Conflicts:
- app/controllers/settings/preferences_controller.rb
- app/lib/user_settings_decorator.rb
- app/models/user.rb
- config/locales/simple_form.en.yml

2019-06-26 23:19:22 +02:00

..

activitypub

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

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

ostatus

…

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-06-26 23:19:22 +02:00

formatter_spec.rb

…

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

…

sanitize_config_spec.rb

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

2019-06-19 18:36:16 +02: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

…

tag_manager_spec.rb

…

user_settings_decorator_spec.rb

…

webfinger_resource_spec.rb

…