monorail
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
mastodon/spec/services
History
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 Add tests to ActivityPub::FetchRemoteKeyService (#19226) 2022-09-24 08:33:27 +02:00
account_search_service_spec.rb
…
account_statuses_cleanup_service_spec.rb Add feature to automatically delete old toots (#16529) 2021-08-09 23:11:50 +02:00
after_block_domain_from_account_service_spec.rb
…
after_block_service_spec.rb Fix single Redis connection being used across all threads (#18135) 2022-04-28 17:47:34 +02:00
app_sign_up_service_spec.rb Add ability to block sign-ups from IP (#19037) 2022-08-24 19:00:37 +02:00
authorize_follow_service_spec.rb Refactor and improve tests (#17386) 2022-01-28 00:46:42 +01:00
batched_remove_status_service_spec.rb Fix single Redis connection being used across all threads (#18135) 2022-04-28 17:47:34 +02:00
block_domain_service_spec.rb Fix various typos (#17621) 2022-02-22 20:14:17 +01:00
block_service_spec.rb Refactor and improve tests (#17386) 2022-01-28 00:46:42 +01:00
bootstrap_timeline_service_spec.rb Add tests for BootstrapTimelineService (#16476) 2021-07-07 21:12:43 +02:00
clear_domain_media_service_spec.rb Fix various typos (#17621) 2022-02-22 20:14:17 +01:00
delete_account_service_spec.rb Fix test-related issues (#17888) 2022-03-28 12:43:58 +02:00
fan_out_on_write_service_spec.rb Fix single Redis connection being used across all threads (#18135) 2022-04-28 17:47:34 +02:00
favourite_service_spec.rb Refactor and improve tests (#17386) 2022-01-28 00:46:42 +01:00
fetch_link_card_service_spec.rb Add support for structured data and more OpenGraph tags to link cards (#16938) 2021-11-05 23:23:05 +01:00
fetch_oembed_service_spec.rb Fix some link previews being incorrectly generated from other prior links (#16885) 2021-10-21 20:39:35 +02:00
fetch_remote_status_service_spec.rb Fix NoMethodError when resolving a link that redirects to a local post (#18314) 2022-05-17 14:52:26 +02:00
fetch_resource_service_spec.rb Refactor ActivityPub handling to prepare for non-Account actors (#19212) 2022-09-21 22:45:57 +02:00
follow_service_spec.rb Add ability to filter followed accounts' posts by language (#19095) 2022-09-20 23:51:21 +02:00
import_service_spec.rb
…
mute_service_spec.rb Fix single Redis connection being used across all threads (#18135) 2022-04-28 17:47:34 +02:00
notify_service_spec.rb Merge branch 'main' into glitch-soc/merge-upstream 2022-03-28 16:22:28 +02:00
post_status_service_spec.rb Fix scheduled statuses decreasing statuses counts (#16791) 2021-10-14 19:59:21 +02:00
precompute_feed_service_spec.rb Fix single Redis connection being used across all threads (#18135) 2022-04-28 17:47:34 +02:00
process_mentions_service_spec.rb Add support for editing for published statuses (#16697) 2022-01-19 22:37:27 +01:00
purge_domain_service_spec.rb Add ability to purge undeliverable domains from admin interface (#16686) 2021-12-17 23:01:21 +01:00
reblog_service_spec.rb Add test for reblog race condition fix (#17732) 2022-03-10 00:11:49 +01:00
reject_follow_service_spec.rb Refactor and improve tests (#17386) 2022-01-28 00:46:42 +01:00
remove_from_follwers_service_spec.rb Add remove from followers api (#16864) 2021-10-18 12:02:35 +02:00
remove_status_service_spec.rb Fix Undo Announce sometimes inlining the originally Announced status (#17516) 2022-02-11 14:52:07 +01:00
report_service_spec.rb Fix various rspec warnings in ReportService tests (#19189) 2022-09-21 22:46:35 +02:00
resolve_account_service_spec.rb Improve error reporting and logging when processing remote accounts (#15605) 2022-09-20 23:30:26 +02:00
resolve_url_service_spec.rb Fix NoMethodError when resolving a link that redirects to a local post (#18314) 2022-05-17 14:52:26 +02:00
search_service_spec.rb
…
suspend_account_service_spec.rb Fix test-related issues (#17888) 2022-03-28 12:43:58 +02:00
unallow_domain_service_spec.rb
…
unblock_domain_service_spec.rb
…
unblock_service_spec.rb Refactor and improve tests (#17386) 2022-01-28 00:46:42 +01:00
unfollow_service_spec.rb Refactor and improve tests (#17386) 2022-01-28 00:46:42 +01:00
unmute_service_spec.rb
…
unsuspend_account_service_spec.rb Fix test-related issues (#17888) 2022-03-28 12:43:58 +02:00
update_account_service_spec.rb Refactor and improve tests (#17386) 2022-01-28 00:46:42 +01:00
update_status_service_spec.rb Fix edits with no actual changes being allowed (#17843) 2022-03-26 00:38:44 +01:00
verify_link_service_spec.rb
…