mastodon/spec/lib
Claire 221580a3af Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/controllers/home_controller.rb`:
  Upstream made it so `/web` is available to non-logged-in users
  and `/` redirects to `/web` instead of `/about`.
  Kept our version since glitch-soc's WebUI doesn't have what's
  needed yet and I think /about is still a much better landing
  page anyway.
- `app/models/form/admin_settings.rb`:
  Upstream added new settings, and glitch-soc had an extra setting.
  Not really a conflict.
  Added upstream's new settings.
- `app/serializers/initial_state_serializer.rb`:
  Upstream added a new `server` initial state object.
  Not really a conflict.
  Merged upstream's changes.
- `app/views/admin/settings/edit.html.haml`:
  Upstream added new settings.
  Not really a conflict.
  Merged upstream's changes.
- `app/workers/scheduler/feed_cleanup_scheduler.rb`:
  Upstream refactored that part and removed the file.
  Ported our relevant changes into `app/lib/vacuum/feeds_vacuum.rb`
- `config/settings.yml`:
  Upstream added new settings.
  Not a real conflict.
  Added upstream's new settings.
2022-10-02 18:46:22 +02:00
..
activitypub Merge branch 'main' into glitch-soc/merge-upstream 2022-10-02 18:46:22 +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
settings Add a test for Settings::Extend#settings (#5720) 2017-11-19 04:15:32 +01:00
vacuum Add retention policy for cached content and media (#19232) 2022-09-27 03:08:19 +02:00
advanced_text_formatter_spec.rb Add test 2022-05-24 10:26:04 +02:00
delivery_failure_tracker_spec.rb Fix single Redis connection being used across all threads (#18135) 2022-04-28 17:47:34 +02:00
emoji_formatter_spec.rb Change RSS feeds (#18356) 2022-05-09 07:43:08 +02:00
entity_cache_spec.rb Fix cache_collection crashing when given an empty collection (#15921) 2021-03-18 00:41:32 +01:00
extractor_spec.rb Spec Extractor (#3540) 2017-06-04 14:57:02 +02:00
fast_ip_map_spec.rb Add IP-based rules (#14963) 2020-10-12 16:33:49 +02:00
feed_manager_spec.rb Merge branch 'main' into glitch-soc/merge-upstream 2022-10-02 18:46:22 +02:00
hash_object_spec.rb Spec HashObject (#3544) 2017-06-04 14:59:52 +02:00
hashtag_normalizer_spec.rb Change how hashtags are normalized (#18795) 2022-07-13 15:03:28 +02:00
html_aware_formatter_spec.rb Fix test-related issues (#17888) 2022-03-28 12:43:58 +02:00
link_details_extractor_spec.rb Add workaround for YouTube Shorts links (#17869) 2022-03-25 19:31:35 +01:00
permalink_redirector_spec.rb Add logged-out access to the web UI (#18961) 2022-09-29 04:39:33 +02:00
plain_text_formatter_spec.rb Refactor formatter (#17828) 2022-03-26 02:53:34 +01: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 typos (#18604) 2022-08-28 17:44:34 +02:00
sanitize_config_spec.rb Add advanced text formatting back into glitch-soc 2022-03-28 22:21:37 +02:00
scope_transformer_spec.rb Change authorized applications page (#17656) 2022-03-01 16:48:58 +01: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
status_reach_finder_spec.rb Add support for editing for published statuses (#16697) 2022-01-19 22:37:27 +01:00
suspicious_sign_in_detector_spec.rb Remove sign-in token authentication, instead send e-mail about new sign-in (#17970) 2022-04-06 20:58:12 +02:00
tag_manager_spec.rb Spelling (#17705) 2022-03-06 22:51:40 +01:00
text_formatter_spec.rb Refactor formatter (#17828) 2022-03-26 02:53:34 +01: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 webfinger returning wrong status code on malformed or missing param (#13759) 2020-05-14 23:28:06 +02:00