This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.
mastodon/spec/lib
Claire fe5f6bc7ed Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `.github/workflows/build-image.yml`:
  Fix erroneous deletion in a previous merge.
- `Gemfile`:
  Conflict caused by glitch-soc-only hCaptcha dependency
- `app/controllers/auth/sessions_controller.rb`:
  Minor conflict due to glitch-soc's theming system.
- `app/controllers/filters_controller.rb`:
  Minor conflict due to glitch-soc's theming system.
- `app/serializers/rest/status_serializer.rb`:
  Minor conflict due to glitch-soc having an extra `local_only` property
2022-06-28 11:11:18 +02:00
..
activitypub Merge branch 'main' into glitch-soc/merge-upstream 2022-04-28 18:16:42 +02:00
connection_pool
ostatus
settings
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
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-06-28 11:11:18 +02:00
hash_object_spec.rb
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 Change routing paths to use usernames in web UI (#16171) 2021-09-26 05:46:13 +02:00
plain_text_formatter_spec.rb Refactor formatter (#17828) 2022-03-26 02:53:34 +01:00
request_pool_spec.rb
request_spec.rb
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
status_finder_spec.rb
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
webfinger_resource_spec.rb Fix webfinger returning wrong status code on malformed or missing param (#13759) 2020-05-14 23:28:06 +02:00