mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-12-21 04:39:23 +00:00
3ef5f62abf
Conflicts: - `.github/workflows/build-image.yml`: Upstream switched to pushing to both DockerHub and GitHub Container Repository, while glitch-soc was already pushing to the latter only. Updated our configuration to be slightly more consistent with upstream's naming and styling, but kept our behavior. - `Gemfile.lock`: Updated dependencies textually too close to glitch-soc only hcaptcha dependency. Updated dependencies as upstream did. - `README.md`: Upstream updated its README, but we have a completely different one. Kept our README, though it probably should be reworked at some point. - `app/views/auth/sessions/two_factor.html.haml`: Minor style fix upstream that's on a line glitch-soc removed because of its different theming system. Kept our file as is. - `spec/controllers/health_controller_spec.rb`: This file apparently did not exist upstream, upstream created it with different contents but it is functionally the same. Switched to upstream's version of the file. - `spec/presenters/instance_presenter_spec.rb`: Upstream changed the specs around `GITHUB_REPOSITORY`, while glitch-soc had its own code because it's a fork and does not have the same default source URL. Took upstream's change, but with glitch-soc's repo as the default case. - `yarn.lock`: Upstream dependencies textually too close to a glitch-soc only one. Updated dependencies as upstream did. |
||
|---|---|---|
| .. | ||
| 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 | ||