luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-12-21 12:47:58 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/app/services
History
Claire 12b935fadf Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `.github/dependabot.yml`:
  Updated upstream, removed in glitch-soc to disable noise.
  Kept removed.
- `CODE_OF_CONDUCT.md`:
  Upstream updated to a new version of the covenant, but I have not read it
  yet, so kept unchanged.
- `Gemfile.lock`:
  Not a real conflict, one upstream dependency updated textually too close to
  the glitch-soc only `hcaptcha` dependency.
  Applied upstream changes.
- `app/controllers/admin/base_controller.rb`:
  Minor conflict due to glitch-soc's theming system.
  Applied upstream changes.
- `app/controllers/application_controller.rb`:
  Minor conflict due to glitch-soc's theming system.
  Applied upstream changes.
- `app/controllers/disputes/base_controller.rb`:
  Minor conflict due to glitch-soc's theming system.
  Applied upstream changes.
- `app/controllers/relationships_controller.rb`:
  Minor conflict due to glitch-soc's theming system.
  Applied upstream changes.
- `app/controllers/statuses_cleanup_controller.rb`:
  Minor conflict due to glitch-soc's theming system.
  Applied upstream changes.
- `app/helpers/application_helper.rb`:
  Minor conflict due to glitch-soc's theming system.
  Applied upstream changes.
- `app/javascript/mastodon/features/compose/components/compose_form.jsx`:
  Upstream added a highlight animation for onboarding, while we changed the
  max character limit.
  Applied our local changes on top of upstream's new version.
- `app/views/layouts/application.html.haml`:
  Minor conflict due to glitch-soc's theming system.
  Applied upstream changes.
- `stylelint.config.js`:
  Upstream added ignore paths, glitch-soc had extra ignore paths.
  Added the same paths as upstream.
2023-04-29 10:44:56 +02:00
..
activitypub Remove instance variables from helper usage (#24203) 2023-04-23 22:35:54 +02:00
concerns Fix deletes not being signed in authorized fetch mode (#17484) 2022-02-11 14:52:45 +01:00
keys Autofix Rubocop remaining Layout rules (#23679) 2023-02-20 06:58:28 +01:00
account_search_service.rb Autofix Rubocop Style/RedundantBegin (#23703) 2023-02-19 07:09:40 +09: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 Fix account domain block not properly unfollowing accounts from domain (#14304) 2020-07-13 19:33:10 +02:00
after_block_service.rb Fix blocking someone not clearing up list feeds (#16205) 2021-05-10 17:31:55 +02:00
after_unallow_domain_service.rb Change account suspensions to be reversible by default (#14726) 2020-09-15 14:37:58 +02:00
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 Remove Salmon and PubSubHubbub (#11205) 2019-07-06 23:26:16 +02:00
backup_service.rb Fix most rubocop issues (#2165) 2023-04-09 11:25:30 +02:00
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-03-05 20:46:56 +01:00
block_domain_service.rb Add support for reversible suspensions through ActivityPub (#14989) 2020-11-08 00:28:39 +01:00
block_service.rb Fix BlockService trying to reject incorrect follow request (#11288) 2019-07-15 00:48:50 +02:00
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 Change sidekiq-bulk's batch size from 10,000 to 1,000 jobs in one Redis call (#24034) 2023-03-15 03:45:15 +01:00
deliver_to_device_service.rb Add E2EE API (#13820) 2020-06-02 19:24:53 +02:00
fan_out_on_write_service.rb Fix most rubocop issues (#2165) 2023-04-09 11:25:30 +02:00
favourite_service.rb Autofix Rubocop remaining Layout rules (#23679) 2023-02-20 06:58:28 +01:00
fetch_link_card_service.rb Enable Rubocop Style/StringConcatenation defaults (#23792) 2023-02-22 09:54:36 +09:00
fetch_oembed_service.rb Drop EOL Ruby 2.7 (#24237) 2023-04-27 01:46:18 +02: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_migration_service.rb Fix original account being unfollowed on migration before the follow request could be sent (#21957) 2023-03-03 21:13:55 +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 Refactoring relations_map (#24195) 2023-03-21 10:32:58 +01:00
move_service.rb Fix account migration not affecting followers on origin server (#11980) 2019-09-29 16:23:13 +02:00
mute_service.rb Add duration parameter to muting. (#13831) 2020-10-13 01:01:14 +02:00
notify_service.rb Fix crash in NotifyService when trying to send an email notification for polls (#24558) 2023-04-17 13:13:36 +02:00
post_status_service.rb Fix most rubocop issues (#2165) 2023-04-09 11:25:30 +02: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 Add editing for published statuses (#17320) 2022-02-10 00:15:30 +01:00
process_mentions_service.rb Autofix Rubocop Style/RedundantBegin (#23703) 2023-02-19 07:09:40 +09:00
purge_domain_service.rb Remove custom emojis on domain purge (#17210) 2021-12-30 08:41:09 +01:00
reblog_service.rb Merge branch 'main' into glitch-soc/merge-upstream 2023-02-19 10:42:55 +01:00
reject_follow_service.rb Remove Salmon and PubSubHubbub (#11205) 2019-07-06 23:26:16 +02:00
remove_domains_from_followers_service.rb Fix “Remove all followers from the selected domains” being more destructive than it claims (#23805) 2023-03-03 20:25:15 +01:00
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 Autofix Rubocop Style/IfUnlessModifier (#23697) 2023-02-18 12:37:47 +01:00
remove_status_service.rb Merge branch 'main' into glitch-soc/merge-upstream 2023-03-15 09:16:10 +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 Rubocop Style/RedundantBegin (#23703) 2023-02-19 07:09:40 +09:00
resolve_url_service.rb Fix unbounded recursion in post discovery (#23506) 2023-02-10 22:16:37 +01:00
search_service.rb Refactoring relations_map (#24195) 2023-03-21 10:32:58 +01:00
suspend_account_service.rb Change sidekiq-bulk's batch size from 10,000 to 1,000 jobs in one Redis call (#24034) 2023-03-15 03:45:15 +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 Replace Status#translatable? with language matrix in separate endpoint (#24037) 2023-03-16 11:07:24 +01:00
unallow_domain_service.rb Fix removing allowed domains being done synchronously (#14302) 2020-07-15 21:08:19 +02:00
unblock_domain_service.rb Add support for reversible suspensions through ActivityPub (#14989) 2020-11-08 00:28:39 +01:00
unblock_service.rb Remove Salmon and PubSubHubbub (#11205) 2019-07-06 23:26:16 +02:00
unfavourite_service.rb Remove Salmon and PubSubHubbub (#11205) 2019-07-06 23:26:16 +02:00
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 Change sidekiq-bulk's batch size from 10,000 to 1,000 jobs in one Redis call (#24034) 2023-03-15 03:45:15 +01:00
update_account_service.rb Change sidekiq-bulk's batch size from 10,000 to 1,000 jobs in one Redis call (#24034) 2023-03-15 03:45:15 +01:00
update_status_service.rb Merge branch 'main' into glitch-soc/merge-upstream 2023-03-31 21:30:27 +02:00
verify_link_service.rb Apply Rubocop Style/NegatedIfElseCondition (#23451) 2023-02-08 07:07:36 +01:00
vote_service.rb Autofix Rubocop remaining Layout rules (#23679) 2023-02-20 06:58:28 +01:00
webhook_service.rb Add administrative webhooks (#18510) 2022-06-09 21:57:36 +02:00