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

Conflicts:
- `app/controllers/statuses_controller.rb`:
  Minor conflict due to theming system

2020-01-24 14:37:06 +01:00

..

activitypub

Fixes featured hashtag setting page erroring out instead of rejecting invalid tags (#12436)

2019-12-17 13:31:56 +01:00

connection_pool

…

ostatus

…

proof_provider/keybase

…

settings

…

delivery_failure_tracker_spec.rb

…

extractor_spec.rb

…

feed_manager_spec.rb

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

2019-08-05 13:13:28 +02:00

formatter_spec.rb

Add support for magnet: URIs (#12905)

2020-01-23 21:27:26 +01:00

hash_object_spec.rb

…

language_detector_spec.rb

…

request_pool_spec.rb

…

request_spec.rb

…

sanitize_config_spec.rb

Add noopener and/or noreferrer (#12202)

2019-10-24 22:44:42 +02:00

spam_check_spec.rb

Remove auto-silence behaviour from spam check (#12117)

2019-10-09 07:11:23 +02:00

status_filter_spec.rb

…

status_finder_spec.rb

…

tag_manager_spec.rb

…

user_settings_decorator_spec.rb

…

webfinger_resource_spec.rb

…