mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-12-20 20:27:07 +00:00
12b935fadf
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. |
||
|---|---|---|
| .. | ||
| activitypub | ||
| concerns | ||
| keys | ||
| account_search_service.rb | ||
| account_statuses_cleanup_service.rb | ||
| after_block_domain_from_account_service.rb | ||
| after_block_service.rb | ||
| after_unallow_domain_service.rb | ||
| app_sign_up_service.rb | ||
| appeal_service.rb | ||
| approve_appeal_service.rb | ||
| authorize_follow_service.rb | ||
| backup_service.rb | ||
| base_service.rb | ||
| batched_remove_status_service.rb | ||
| block_domain_service.rb | ||
| block_service.rb | ||
| bootstrap_timeline_service.rb | ||
| clear_domain_media_service.rb | ||
| create_featured_tag_service.rb | ||
| delete_account_service.rb | ||
| deliver_to_device_service.rb | ||
| fan_out_on_write_service.rb | ||
| favourite_service.rb | ||
| fetch_link_card_service.rb | ||
| fetch_oembed_service.rb | ||
| fetch_remote_status_service.rb | ||
| fetch_resource_service.rb | ||
| follow_migration_service.rb | ||
| follow_service.rb | ||
| import_service.rb | ||
| move_service.rb | ||
| mute_service.rb | ||
| notify_service.rb | ||
| post_status_service.rb | ||
| precompute_feed_service.rb | ||
| process_hashtags_service.rb | ||
| process_mentions_service.rb | ||
| purge_domain_service.rb | ||
| reblog_service.rb | ||
| reject_follow_service.rb | ||
| remove_domains_from_followers_service.rb | ||
| remove_featured_tag_service.rb | ||
| remove_from_followers_service.rb | ||
| remove_status_service.rb | ||
| report_service.rb | ||
| resolve_account_service.rb | ||
| resolve_url_service.rb | ||
| search_service.rb | ||
| suspend_account_service.rb | ||
| tag_search_service.rb | ||
| translate_status_service.rb | ||
| unallow_domain_service.rb | ||
| unblock_domain_service.rb | ||
| unblock_service.rb | ||
| unfavourite_service.rb | ||
| unfollow_service.rb | ||
| unmute_service.rb | ||
| unsuspend_account_service.rb | ||
| update_account_service.rb | ||
| update_status_service.rb | ||
| verify_link_service.rb | ||
| vote_service.rb | ||
| webhook_service.rb | ||