treehouse
/
mastodon
22
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity
mastodon/spec/lib
History
Claire de7f936b96 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `app/controllers/accounts_controller.rb`:
  Upstream introduced support for private pinned toots, but glitch-soc's query
  was a bit different as it filtered out local-only toots.
  Used upstream's query, while adding local-only filtering back.
- `app/controllers/activitypub/collections_controller.rb`:
  Same thing with regards to local-only posts.
- `app/validators/status_pin_validator.rb`:
  Not a real conflict, but the line below was different in glitch-soc due to
  the configurable pinned toots limit.
 		2022-01-17 08:28:52 +01:00
..
activitypub Merge branch 'main' into glitch-soc/merge-upstream 2022-01-17 08:28:52 +01: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
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
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
…
fast_ip_map_spec.rb Add IP-based rules (#14963) 2020-10-12 16:33:49 +02:00
feed_manager_spec.rb Merge branch 'master' into glitch-soc/merge-upstream 2020-12-09 14:42:33 +01:00
formatter_spec.rb Merge branch 'main' into glitch-soc/merge-upstream 2021-03-02 12:06:58 +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
link_details_extractor_spec.rb Add support for structured data and more OpenGraph tags to link cards (#16938) 2021-11-05 23:23:05 +01:00
permalink_redirector_spec.rb Change routing paths to use usernames in web UI (#16171) 2021-09-26 05:46:13 +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 Merge branch 'main' into glitch-soc/merge-upstream 2021-03-19 13:57:15 +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
tag_manager_spec.rb Change multiple mentions with same username to render with domain (#15718) 2021-04-10 11:51:02 +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