mastodon/spec/services
Thibaut Girka ec49aa8175 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `.github/dependabot.yml`:
  Updated upstream, we deleted it to not be flooded by Depandabot.
  Kept deleted.
- `Gemfile.lock`:
  Puma updated on both sides, went for the most recent version.
- `app/controllers/api/v1/mutes_controller.rb`:
  Upstream updated the serializer to support timed mutes, while
  glitch-soc added a custom API ages ago to get information that
  is already available elsewhere.
  Dropped the glitch-soc-specific API, went with upstream changes.
- `app/javascript/core/admin.js`:
  Conflict due to changing how assets are loaded. Went with upstream.
- `app/javascript/packs/public.js`:
  Conflict due to changing how assets are loaded. Went with upstream.
- `app/models/mute.rb`:
  🤷
- `app/models/user.rb`:
  New user setting added upstream while we have glitch-soc-specific
  user settings. Added upstream's user setting.
- `config/settings.yml`:
  Upstream added a new user setting close to a user setting we had
  changed the defaults for. Added the new upstream setting.
- `package.json`:
  Upstream dependency updated “too close” to a glitch-soc-specific
  dependency. No real conflict. Updated the dependency.
2020-10-21 19:10:50 +02:00
..
activitypub Add follower synchronization mechanism (#14510) 2020-10-21 18:04:09 +02:00
account_search_service_spec.rb Add more accurate account search (#11537) 2019-08-16 01:24:03 +02:00
after_block_domain_from_account_service_spec.rb
after_block_service_spec.rb
app_sign_up_service_spec.rb Add IP-based rules (#14963) 2020-10-12 16:33:49 +02:00
authorize_follow_service_spec.rb Remove Salmon and PubSubHubbub (#11205) 2019-07-06 23:26:16 +02:00
batched_remove_status_service_spec.rb Remove WebSub subscriptions (#11303) 2019-07-21 04:08:00 +02:00
block_domain_service_spec.rb Record account suspend/silence time and keep track of domain blocks (#10660) 2019-05-14 19:05:02 +02:00
block_service_spec.rb Remove Salmon and PubSubHubbub (#11205) 2019-07-06 23:26:16 +02:00
bootstrap_timeline_service_spec.rb Fix BootstrapTimelineService crashing when bootstrapped accounts are invalid (#12037) 2019-10-01 15:10:00 +02:00
clear_domain_media_service_spec.rb Make domain block/silence/reject-media code more robust (#13424) 2020-06-09 10:32:00 +02:00
delete_account_service_spec.rb Change account suspensions to be reversible by default (#14726) 2020-09-15 14:37:58 +02:00
fan_out_on_write_service_spec.rb Refactor how public and tag timelines are queried (#14728) 2020-09-07 11:02:04 +02:00
favourite_service_spec.rb Remove Salmon and PubSubHubbub (#11205) 2019-07-06 23:26:16 +02:00
fetch_link_card_service_spec.rb Fix FetchLinkCardServices crashing on a tags without a target (#12159) 2019-11-21 16:04:52 +01:00
fetch_oembed_service_spec.rb Add cache for OEmbed endpoints to avoid extra HTTP requests (#12403) 2019-11-17 18:40:33 +01:00
fetch_remote_status_service_spec.rb Clean up OStatus-related codepaths (#12173) 2019-12-17 13:32:57 +01:00
fetch_resource_service_spec.rb Fix not being able to resolve public resources in development environment (#13505) 2020-04-25 22:01:08 +02:00
follow_service_spec.rb Change silences to always require approval on follow (#11975) 2019-09-27 21:13:51 +02:00
import_service_spec.rb Add option to be notified when a followed user posts (#13546) 2020-09-18 17:26:45 +02:00
mute_service_spec.rb
notify_service_spec.rb Merge branch 'master' into glitch-soc/merge-upstream 2020-09-28 14:13:30 +02:00
post_status_service_spec.rb Fix media not being marked sensitive when client sets a CW but no text (#13277) 2020-03-25 22:40:58 +01:00
precompute_feed_service_spec.rb
process_mentions_service_spec.rb Fix IDN mentions not being processed, IDN domains not being rendered (#12715) 2019-12-30 19:20:43 +01:00
reblog_service_spec.rb Remove Salmon and PubSubHubbub (#11205) 2019-07-06 23:26:16 +02:00
reject_follow_service_spec.rb Remove Salmon and PubSubHubbub (#11205) 2019-07-06 23:26:16 +02:00
remove_status_service_spec.rb Remove WebSub subscriptions (#11303) 2019-07-21 04:08:00 +02:00
report_service_spec.rb Set and store report URIs (#10303) 2019-03-17 15:34:56 +01:00
resolve_account_service_spec.rb Refactor domain block checks (#11268) 2019-07-09 03:27:35 +02:00
resolve_url_service_spec.rb Refactor fetching of remote resources (#11251) 2019-07-10 18:59:28 +02:00
search_service_spec.rb Fix hashtag search performing account search as well (#13758) 2020-05-14 23:37:37 +02:00
unallow_domain_service_spec.rb Fix various warnings in rspec (#14729) 2020-09-04 20:22:26 +02:00
unblock_domain_service_spec.rb Add domain block notes (#11515) 2019-08-07 20:20:23 +02:00
unblock_service_spec.rb Remove Salmon and PubSubHubbub (#11205) 2019-07-06 23:26:16 +02:00
unfollow_service_spec.rb Remove Salmon and PubSubHubbub (#11205) 2019-07-06 23:26:16 +02:00
unmute_service_spec.rb
update_account_service_spec.rb Change silences to always require approval on follow (#11975) 2019-09-27 21:13:51 +02:00
verify_link_service_spec.rb Add noopener and/or noreferrer (#12202) 2019-10-24 22:44:42 +02:00