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

Conflicts:
- README.md
- app/javascript/styles/mastodon/components.scss
  conflicts caused by image URLs being different
- app/models/status.rb
  as_home_timeline removed, kept glitch-soc-only as_direct_timeline
- app/views/statuses/_simple_status.html.haml
- config/locales/en.yml
  some strings were changed upstream
- spec/models/status_spec.rb
  as_home_timeline removed, kept glitch-soc-only as_direct_timeline

2019-10-10 17:26:08 +02:00

..

activitypub

Change silences to always require approval on follow (#11975)

2019-09-27 21:13:51 +02:00

connection_pool

Add request pool to improve delivery performance (#10353)

2019-07-02 00:34:38 +02:00

ostatus

Remove Atom feeds and old URLs in the form of GET /:username/updates/:id (#11247)

2019-07-07 16:16:51 +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

After 7 days of repeated delivery failures, give up on inbox (#5131)

2017-09-29 03:16:20 +02:00

extractor_spec.rb

Spec Extractor (#3540)

2017-06-04 14:57:02 +02:00

feed_manager_spec.rb

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

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

formatter_spec.rb

Play animated custom emoji on hover (#11348)

2019-07-21 18:10:40 +02:00

hash_object_spec.rb

Spec HashObject (#3544)

2017-06-04 14:59:52 +02:00

language_detector_spec.rb

Change language detection to include hashtags as words (#11341)

2019-07-18 03:02:15 +02:00

request_pool_spec.rb

Add request pool to improve delivery performance (#10353)

2019-07-02 00:34:38 +02:00

request_spec.rb

Fix connect timeout not being enforced (#9329)

2018-11-22 20:12:04 +01:00

sanitize_config_spec.rb

Fix sanitizer text case for glitch-soc, which preserves lists

2019-07-19 19:16:07 +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

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

2019-05-14 19:05:02 +02:00

status_finder_spec.rb

Remove Atom feeds and old URLs in the form of GET /:username/updates/:id (#11247)

2019-07-07 16:16:51 +02:00

tag_manager_spec.rb

Remove Atom feeds and old URLs in the form of GET /:username/updates/:id (#11247)

2019-07-07 16:16:51 +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

Fix randomly fail (regression from #3560) (#3580)

2017-06-05 10:03:36 +02:00