treehouse
/
mastodon
22
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity
mastodon/app/services
History
Claire ce84d163cc Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `.prettierignore`:
  Upstream added a line at the end, glitch-soc had extra entries at the end.
  Added upstream's new line before glitch-soc's.
- `Gemfile.lock`:
  Upstream updated dependencies while glitch-soc has an extra one (hcaptcha).
  Updated dependencies like upstream did.
- `app/controllers/api/v1/statuses_controller.rb`:
  Not a real conflict, upstream added a parameter (`allowed_mentions`) where
  glitch-soc already had an extra one (`content_type`).
  Added upstream's new parameter.
- `app/javascript/styles/fonts/roboto-mono.scss`:
  A lot of lines were changed upstream due to code style changes, and a lot
  of those lines had path changes to accomodate glitch-soc's theming system.
  Applied upstream's style changes.
- `app/javascript/styles/fonts/roboto.scss`:
  A lot of lines were changed upstream due to code style changes, and a lot
  of those lines had path changes to accomodate glitch-soc's theming system.
  Applied upstream's style changes.
 		2023-02-13 19:35:35 +01:00
..
activitypub Fix unbounded recursion in post discovery (#23506) 2023-02-10 22:16:37 +01:00
concerns
…
keys Autofix Rails/EagerEvaluationLogMessage (#23429) 2023-02-07 03:44:36 +01:00
account_search_service.rb Improve performance by avoiding regex construction (#20215) 2022-11-10 05:49:30 +01:00
account_statuses_cleanup_service.rb Fix reblogs being discarded after the reblogged status (#19731) 2022-11-04 16:31:44 +01:00
after_block_domain_from_account_service.rb
…
after_block_service.rb
…
after_unallow_domain_service.rb
…
app_sign_up_service.rb Add ability to block sign-ups from IP (#19037) 2022-08-24 19:00:37 +02:00
appeal_service.rb Add customizable user roles (#18641) 2022-07-05 02:41:40 +02:00
approve_appeal_service.rb Fix moderator leak in undo_mark_statuses_as_sensitive (#18525) 2022-05-26 22:04:16 +02:00
authorize_follow_service.rb
…
backup_service.rb
…
base_service.rb Add administrative webhooks (#18510) 2022-06-09 21:57:36 +02:00
batched_remove_status_service.rb Merge branch 'main' into glitch-soc/merge-upstream 2023-01-12 10:15:46 +01:00
block_domain_service.rb
…
block_service.rb
…
bootstrap_timeline_service.rb Add customizable user roles (#18641) 2022-07-05 02:41:40 +02:00
clear_domain_media_service.rb Fix incorrect and slow cache invalidation in ClearDomainMediaService (#19062) 2022-08-27 00:45:54 +02:00
create_featured_tag_service.rb Fix `Settings::FeaturedTagsController` (#19418) 2022-10-22 23:14:58 +02:00
delete_account_service.rb Revert "Remove LDSignature on actor Delete activities (#21466)" (#23185) 2023-01-21 15:33:21 +01:00
deliver_to_device_service.rb
…
fan_out_on_write_service.rb Merge branch 'main' into glitch-soc/merge-upstream 2022-11-06 09:50:41 +01:00
favourite_service.rb Fix duplicate notifications being possible after poll expiration (#17697) 2022-03-04 01:06:33 +01:00
fetch_link_card_service.rb Autofix Rails/EagerEvaluationLogMessage (#23429) 2023-02-07 03:44:36 +01:00
fetch_oembed_service.rb Apply Rubocop Style/NegatedIfElseCondition (#23451) 2023-02-08 07:07:36 +01:00
fetch_remote_status_service.rb Fix unbounded recursion in post discovery (#23506) 2023-02-10 22:16:37 +01:00
fetch_resource_service.rb Autofix Rails/EagerEvaluationLogMessage (#23429) 2023-02-07 03:44:36 +01:00
follow_service.rb Add ability to filter followed accounts' posts by language (#19095) 2022-09-20 23:51:21 +02:00
import_service.rb Support UTF-8 Characters in Domains During CSV Import (#20592) 2022-11-14 05:52:13 +01:00
move_service.rb
…
mute_service.rb
…
notify_service.rb Add customizable user roles (#18641) 2022-07-05 02:41:40 +02:00
post_status_service.rb Merge branch 'main' into glitch-soc/merge-upstream 2023-02-13 19:35:35 +01:00
precompute_feed_service.rb Merge branch 'main' into glitch-soc/merge-upstream 2022-04-28 18:16:42 +02:00
process_hashtags_service.rb
…
process_mentions_service.rb Add API parameter to safeguard unexpect mentions in new posts (#18350) 2023-02-13 16:36:29 +01:00
purge_domain_service.rb
…
reblog_service.rb
…
reject_follow_service.rb
…
remove_featured_tag_service.rb Change featured tag updates to add/remove activity (#19409) 2022-10-22 18:30:55 +02:00
remove_from_followers_service.rb
…
remove_status_service.rb Merge branch 'main' into glitch-soc/merge-upstream 2022-11-06 09:50:41 +01:00
report_service.rb Change Report category to "violation" if rule IDs are provided (#20137) 2022-11-08 17:28:02 +01:00
resolve_account_service.rb Autofix Rails/EagerEvaluationLogMessage (#23429) 2023-02-07 03:44:36 +01:00
resolve_url_service.rb Fix unbounded recursion in post discovery (#23506) 2023-02-10 22:16:37 +01:00
search_service.rb
…
suspend_account_service.rb Fix possible race conditions when suspending/unsuspending accounts (#22363) 2023-01-05 13:47:21 +01:00
tag_search_service.rb Ensure exact match is the first result in hashtag searches (#21315) 2022-12-15 18:41:40 +01:00
translate_status_service.rb Fix translations not being formatted, other issues in web UI (#19245) 2022-09-28 01:02:01 +02:00
unallow_domain_service.rb
…
unblock_domain_service.rb
…
unblock_service.rb
…
unfavourite_service.rb
…
unfollow_service.rb Fix concurrent unfollowing decrementing follower count more than once (#18527) 2022-05-26 22:14:47 +02:00
unmute_service.rb
…
unsuspend_account_service.rb Fix possible race conditions when suspending/unsuspending accounts (#22363) 2023-01-05 13:47:21 +01:00
update_account_service.rb Fix being able to spoof link verification (#20217) 2022-11-09 08:24:21 +01:00
update_status_service.rb Merge branch 'main' into glitch-soc/merge-upstream 2023-01-18 17:38:11 +01:00
verify_link_service.rb Apply Rubocop Style/NegatedIfElseCondition (#23451) 2023-02-08 07:07:36 +01:00
vote_service.rb Fix empty votes arbitrarily increasing voters count in polls (#18526) 2022-05-26 22:06:10 +02:00
webhook_service.rb Add administrative webhooks (#18510) 2022-06-09 21:57:36 +02:00