mastodon/spec/lib
Thibaut Girka 12c8ac9e14 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `app/controllers/activitypub/collections_controller.rb`:
  Conflict due to glitch-soc having to take care of local-only
  pinned toots in that controller.
  Took upstream's changes and restored the local-only special
  handling.
- `app/controllers/auth/sessions_controller.rb`:
  Minor conflicts due to the theming system, applied upstream
  changes, adapted the following two files for glitch-soc's
  theming system:
  - `app/controllers/concerns/sign_in_token_authentication_concern.rb`
  - `app/controllers/concerns/two_factor_authentication_concern.rb`
- `app/services/backup_service.rb`:
  Minor conflict due to glitch-soc having to handle local-only
  toots specially. Applied upstream changes and restored
  the local-only special handling.
- `app/views/admin/custom_emojis/index.html.haml`:
  Minor conflict due to the theming system.
- `package.json`:
  Upstream dependency updated, too close to a glitch-soc-only
  dependency in the file.
- `yarn.lock`:
  Upstream dependency updated, too close to a glitch-soc-only
  dependency in the file.
2020-06-09 10:39:20 +02:00
..
activitypub Add E2EE API (#13820) 2020-06-02 19:24:53 +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
rss Improve RSS entries for statuses (#13592) 2020-05-10 09:50:54 +02:00
settings
delivery_failure_tracker_spec.rb Change delivery failure tracking to work with hostnames instead of URLs (#13437) 2020-04-15 20:33:24 +02:00
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 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 exception when trying to serialize posts with <a> tags in them without hrefs (#1334) 2020-05-28 12:47:40 +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
webfinger_resource_spec.rb Fix webfinger returning wrong status code on malformed or missing param (#13759) 2020-05-14 23:28:06 +02:00