mirror of
https://github.com/mastodon/mastodon.git
synced 2024-12-13 22:55:07 +01:00
12c8ac9e14
Conflicts: - `app/controllers/activitypub/collections_controller.rb`: Conflict due to glitch-soc having to take care of local-only pinned toots in that controller. Took upstream's changes and restored the local-only special handling. - `app/controllers/auth/sessions_controller.rb`: Minor conflicts due to the theming system, applied upstream changes, adapted the following two files for glitch-soc's theming system: - `app/controllers/concerns/sign_in_token_authentication_concern.rb` - `app/controllers/concerns/two_factor_authentication_concern.rb` - `app/services/backup_service.rb`: Minor conflict due to glitch-soc having to handle local-only toots specially. Applied upstream changes and restored the local-only special handling. - `app/views/admin/custom_emojis/index.html.haml`: Minor conflict due to the theming system. - `package.json`: Upstream dependency updated, too close to a glitch-soc-only dependency in the file. - `yarn.lock`: Upstream dependency updated, too close to a glitch-soc-only dependency in the file. |
||
---|---|---|
.. | ||
activitypub | ||
account_search_service_spec.rb | ||
after_block_domain_from_account_service_spec.rb | ||
after_block_service_spec.rb | ||
app_sign_up_service_spec.rb | ||
authorize_follow_service_spec.rb | ||
batched_remove_status_service_spec.rb | ||
block_domain_service_spec.rb | ||
block_service_spec.rb | ||
bootstrap_timeline_service_spec.rb | ||
clear_domain_media_service_spec.rb | ||
fan_out_on_write_service_spec.rb | ||
favourite_service_spec.rb | ||
fetch_link_card_service_spec.rb | ||
fetch_oembed_service_spec.rb | ||
fetch_remote_status_service_spec.rb | ||
fetch_resource_service_spec.rb | ||
follow_service_spec.rb | ||
hashtag_query_service_spec.rb | ||
import_service_spec.rb | ||
mute_service_spec.rb | ||
notify_service_spec.rb | ||
post_status_service_spec.rb | ||
precompute_feed_service_spec.rb | ||
process_mentions_service_spec.rb | ||
reblog_service_spec.rb | ||
reject_follow_service_spec.rb | ||
remove_status_service_spec.rb | ||
report_service_spec.rb | ||
resolve_account_service_spec.rb | ||
resolve_url_service_spec.rb | ||
search_service_spec.rb | ||
suspend_account_service_spec.rb | ||
unblock_domain_service_spec.rb | ||
unblock_service_spec.rb | ||
unfollow_service_spec.rb | ||
unmute_service_spec.rb | ||
update_account_service_spec.rb | ||
verify_link_service_spec.rb |